summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into evacBrenton Leanhardt2016-04-2519-20/+299
|\
| * Merge pull request #1802 from detiber/etcd_fact_depsJason DeTiberus2016-04-251-1/+1
| |\
| | * openshift_etcd_facts should rely on openshift_facts not openshift_commonJason DeTiberus2016-04-251-1/+1
| * | Merge pull request #1385 from sdodson/global-proxyJason DeTiberus2016-04-2515-16/+283
| |\ \
| | * | Sort and de-dupe no_proxy listScott Dodson2016-04-251-0/+18
| | * | Add global proxy configurationScott Dodson2016-04-2215-16/+265
| * | | Merge pull request #1786 from enoodle/additional_features_metricsJason DeTiberus2016-04-254-3/+15
| |\ \ \ | | |_|/ | |/| |
| | * | openshift-metrics: adding duration and resolution optionsErez Freiberger2016-04-244-3/+15
* | | | Pod must be recreated for the upgradeBrenton Leanhardt2016-04-254-13/+30
|/ / /
* | | Merge pull request #1796 from donovanmuller/masterJason DeTiberus2016-04-254-4/+4
|\ \ \
| * | | As per https://github.com/openshift/openshift-ansible/issues/1795#issuecommen...Donovan Muller2016-04-244-4/+4
| |/ /
* | | Merge pull request #1798 from ibotty/remove_duplicate_registerJason DeTiberus2016-04-251-1/+0
|\ \ \
| * | | remove duplicate register:Tobias Florek2016-04-061-1/+0
* | | | Merge pull request #1782 from vishpat/serviceaccount_reviewJason DeTiberus2016-04-254-67/+67
|\ \ \ \ | |_|/ / |/| | |
| * | | Changed service account creation to ansibleVishal Patil2016-04-244-67/+67
|/ / /
* | / Automatic commit of package [openshift-ansible] release [3.0.84-1].Troy Dawson2016-04-222-2/+8
| |/ |/|
* | Merge pull request #1792 from detiber/fix_docker_version_checkJason DeTiberus2016-04-221-1/+1
|\ \
| * | Fix for docker not presentJason DeTiberus2016-04-221-1/+1
|/ /
* | Merge pull request #1791 from liggitt/reconcile-role-additiveJason DeTiberus2016-04-224-5/+5
|\ \
| * | Reconcile roles in additive-only mode on upgradeJordan Liggitt2016-04-224-5/+5
|/ /
* | Merge pull request #1785 from abutcher/master-etcd-varsBrenton Leanhardt2016-04-211-0/+2
|\ \
| * | Set etcd_hostname and etcd_ip for masters w/ external etcd.Andrew Butcher2016-04-211-0/+2
* | | Automatic commit of package [openshift-ansible] release [3.0.83-1].Troy Dawson2016-04-212-2/+12
* | | Merge pull request #1787 from smunilla/BZ1329165Brenton Leanhardt2016-04-211-1/+1
|\ \ \
| * | | a-o-i: Correct bug with default storage hostSamuel Munilla2016-04-211-1/+1
* | | | Merge pull request #1783 from dgoodwin/portal-netBrenton Leanhardt2016-04-211-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix bug after portal_net move from master to common role.Devan Goodwin2016-04-211-2/+2
| |/ /
* | | Merge pull request #1784 from brenton/reconcile1Brenton Leanhardt2016-04-211-1/+1
|\ \ \ | |/ / |/| |
| * | Only add new sccsBrenton Leanhardt2016-04-211-1/+1
* | | Merge pull request #1756 from abhat/configurable_admin_user_passBrenton Leanhardt2016-04-203-1/+10
|\ \ \ | |/ / |/| |
| * | Support configurable admin user and password for the enterpriseAniket Bhat2016-04-183-1/+10
* | | Merge pull request #1776 from sdodson/image-stream-syncBrenton Leanhardt2016-04-2010-170/+339
|\ \ \
| * | | Sync latest contentScott Dodson2016-04-199-168/+337
| * | | Use xpaas 1.3.0-1, use enterprise content for metricsScott Dodson2016-04-191-2/+2
* | | | Automatic commit of package [openshift-ansible] release [3.0.82-1].Troy Dawson2016-04-202-2/+25
* | | | Merge pull request #1758 from dgoodwin/fix-json-varsBrenton Leanhardt2016-04-201-1/+1
|\ \ \ \
| * | | | Fix use of JSON inventory vars with raw booleans.Devan Goodwin2016-04-151-1/+1
* | | | | Merge pull request #1754 from abutcher/etcd-cert-fixesBrenton Leanhardt2016-04-2017-77/+92
|\ \ \ \ \
| * | | | | Remove etcd_interface variable. Remove openshift_docker dependency from the e...Andrew Butcher2016-04-202-2/+0
| * | | | | Use openshift_hostname/openshift_ip values for etcd configuration and certifi...Andrew Butcher2016-04-2016-75/+92
| | |/ / / | |/| | |
* | | | | Merge pull request #1742 from dgoodwin/docker-loggingBrenton Leanhardt2016-04-206-6/+20
|\ \ \ \ \
| * | | | | Use a JSON list for docker log options.Devan Goodwin2016-04-205-5/+19
| * | | | | Fix legacy cli_docker_* vars not migrating.Devan Goodwin2016-04-201-1/+1
|/ / / / /
* | | | | Merge pull request #1781 from dgoodwin/image-tag-ver-2Brenton Leanhardt2016-04-203-4/+5
|\ \ \ \ \
| * | | | | Fix use of older image tag version during upgrade.Devan Goodwin2016-04-203-4/+5
|/ / / / /
* | | | | Merge pull request #1766 from abutcher/router-selectorBrenton Leanhardt2016-04-208-17/+51
|\ \ \ \ \
| * | | | | Translate legacy facts within the oo_openshift_env filter.Andrew Butcher2016-04-202-7/+8
| * | | | | Remove empty facts from nested dictionaries.Andrew Butcher2016-04-201-8/+18
| * | | | | Fix router selector fact migration and match multiple selectors when counting...Andrew Butcher2016-04-209-8/+31
* | | | | | Merge pull request #1582 from jdnieto/openshift_metricsBrenton Leanhardt2016-04-209-1/+162
|\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 01:40:36 +0000