Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1765 from smunilla/proxy_ui | Jason DeTiberus | 2016-04-26 | 3 | -1/+29 |
|\ | |||||
| * | a-o-i: Update prompt when asking for proxy | Samuel Munilla | 2016-04-19 | 1 | -0/+11 |
| * | a-o-i: UI additions for proxies | Samuel Munilla | 2016-04-18 | 3 | -1/+18 |
* | | Merge pull request #1726 from detiber/htpasswd_users | Jason DeTiberus | 2016-04-26 | 7 | -4/+103 |
|\ \ | |||||
| * | | Add support for setting identity provider custom values | Jason DeTiberus | 2016-04-25 | 7 | -4/+103 |
* | | | Merge pull request #1799 from ibotty/port_filter_plugins_to_ansible_2 | Jason DeTiberus | 2016-04-25 | 2 | -5/+10 |
|\ \ \ | |||||
| * | | | port filter_plugins to ansible2 | Tobias Florek | 2016-04-25 | 2 | -5/+10 |
* | | | | Automatic commit of package [openshift-ansible] release [3.0.85-1]. | Troy Dawson | 2016-04-25 | 2 | -2/+19 |
* | | | | Merge pull request #1777 from brenton/evac | Jason DeTiberus | 2016-04-25 | 4 | -13/+30 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into evac | Brenton Leanhardt | 2016-04-25 | 19 | -20/+299 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Pod must be recreated for the upgrade | Brenton Leanhardt | 2016-04-25 | 4 | -13/+30 |
* | | | | | Merge pull request #1793 from detiber/default_subdomain | Jason DeTiberus | 2016-04-25 | 2 | -4/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fix backward compat for osm_default_subdomain | Jason DeTiberus | 2016-04-25 | 2 | -4/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #1803 from sdodson/issue1800 | Jason DeTiberus | 2016-04-25 | 2 | -4/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Merge branch 'master' into issue1800 | Scott Dodson | 2016-04-25 | 25 | -92/+370 |
| |\| | | | | |||||
| * | | | | | Fix image version handling for v1.2.0-rc1 | Scott Dodson | 2016-04-25 | 2 | -4/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #1804 from abutcher/v2-sudo | Jason DeTiberus | 2016-04-25 | 51 | -104/+104 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Replace deprecated sudo with become. | Andrew Butcher | 2016-04-25 | 51 | -104/+104 |
* | | | | | Merge pull request #1802 from detiber/etcd_fact_deps | Jason DeTiberus | 2016-04-25 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | openshift_etcd_facts should rely on openshift_facts not openshift_common | Jason DeTiberus | 2016-04-25 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1385 from sdodson/global-proxy | Jason DeTiberus | 2016-04-25 | 15 | -16/+283 |
|\ \ \ \ | |||||
| * | | | | Sort and de-dupe no_proxy list | Scott Dodson | 2016-04-25 | 1 | -0/+18 |
| * | | | | Add global proxy configuration | Scott Dodson | 2016-04-22 | 15 | -16/+265 |
* | | | | | Merge pull request #1786 from enoodle/additional_features_metrics | Jason DeTiberus | 2016-04-25 | 4 | -3/+15 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | openshift-metrics: adding duration and resolution options | Erez Freiberger | 2016-04-24 | 4 | -3/+15 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1796 from donovanmuller/master | Jason DeTiberus | 2016-04-25 | 4 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | As per https://github.com/openshift/openshift-ansible/issues/1795#issuecommen... | Donovan Muller | 2016-04-24 | 4 | -4/+4 |
| |/ / / | |||||
* | | | | Merge pull request #1798 from ibotty/remove_duplicate_register | Jason DeTiberus | 2016-04-25 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | remove duplicate register: | Tobias Florek | 2016-04-06 | 1 | -1/+0 |
* | | | | | Merge pull request #1782 from vishpat/serviceaccount_review | Jason DeTiberus | 2016-04-25 | 4 | -67/+67 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Changed service account creation to ansible | Vishal Patil | 2016-04-24 | 4 | -67/+67 |
|/ / / / | |||||
* | / / | Automatic commit of package [openshift-ansible] release [3.0.84-1]. | Troy Dawson | 2016-04-22 | 2 | -2/+8 |
| |/ / |/| | | |||||
* | | | Merge pull request #1792 from detiber/fix_docker_version_check | Jason DeTiberus | 2016-04-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix for docker not present | Jason DeTiberus | 2016-04-22 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1791 from liggitt/reconcile-role-additive | Jason DeTiberus | 2016-04-22 | 4 | -5/+5 |
|\ \ \ | |||||
| * | | | Reconcile roles in additive-only mode on upgrade | Jordan Liggitt | 2016-04-22 | 4 | -5/+5 |
|/ / / | |||||
* | | | Merge pull request #1785 from abutcher/master-etcd-vars | Brenton Leanhardt | 2016-04-21 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Set etcd_hostname and etcd_ip for masters w/ external etcd. | Andrew Butcher | 2016-04-21 | 1 | -0/+2 |
* | | | | Automatic commit of package [openshift-ansible] release [3.0.83-1]. | Troy Dawson | 2016-04-21 | 2 | -2/+12 |
* | | | | Merge pull request #1787 from smunilla/BZ1329165 | Brenton Leanhardt | 2016-04-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | a-o-i: Correct bug with default storage host | Samuel Munilla | 2016-04-21 | 1 | -1/+1 |
* | | | | | Merge pull request #1783 from dgoodwin/portal-net | Brenton Leanhardt | 2016-04-21 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix bug after portal_net move from master to common role. | Devan Goodwin | 2016-04-21 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge pull request #1784 from brenton/reconcile1 | Brenton Leanhardt | 2016-04-21 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Only add new sccs | Brenton Leanhardt | 2016-04-21 | 1 | -1/+1 |
* | | | | Merge pull request #1756 from abhat/configurable_admin_user_pass | Brenton Leanhardt | 2016-04-20 | 3 | -1/+10 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Support configurable admin user and password for the enterprise | Aniket Bhat | 2016-04-18 | 3 | -1/+10 |
* | | | | Merge pull request #1776 from sdodson/image-stream-sync | Brenton Leanhardt | 2016-04-20 | 10 | -170/+339 |
|\ \ \ \ | |||||
| * | | | | Sync latest content | Scott Dodson | 2016-04-19 | 9 | -168/+337 |
| * | | | | Use xpaas 1.3.0-1, use enterprise content for metrics | Scott Dodson | 2016-04-19 | 1 | -2/+2 |