summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4123 from rhcarvalho/remove-vim-lineRodolfo Carvalho2017-05-1019-43/+0
|\
| * Remove vim configuration from Python filesRodolfo Carvalho2017-05-0919-43/+0
* | Merge pull request #4106 from ashcrow/1448384OpenShift Bot2017-05-092-6/+14
|\ \
| * | Use local variables for daemon.json templateSteve Milner2017-05-082-6/+14
* | | Merge pull request #4135 from mtnbikenc/fix-travisScott Dodson2017-05-091-0/+1
|\ \ \
| * | | Fix issue with Travis-CI using old pip versionRussell Teague2017-05-091-0/+1
* | | | Automatic commit of package [openshift-ansible] release [3.6.62-1].Jenkins CD Merge Bot2017-05-092-2/+5
|/ / /
* | / Automatic commit of package [openshift-ansible] release [3.6.61-1].Jenkins CD Merge Bot2017-05-092-2/+5
| |/ |/|
* | Automatic commit of package [openshift-ansible] release [3.6.60-1].Jenkins CD Merge Bot2017-05-082-2/+5
* | Automatic commit of package [openshift-ansible] release [3.6.59-1].Jenkins CD Merge Bot2017-05-082-2/+9
* | Merge pull request #4026 from ewolinetz/cherry_picks_15OpenShift Bot2017-05-087-13/+51
|\ \
| * | Updating logging and metrics to restart api, ha and controllers when updating...ewolinetz2017-04-285-6/+30
| * | Adding defaults for es_indicesewolinetz2017-04-271-2/+2
| * | Updating logic for generating pvcs and their counts to prevent reuse when loo...ewolinetz2017-04-272-7/+21
* | | Automatic commit of package [openshift-ansible] release [3.6.58-1].Jenkins CD Merge Bot2017-05-082-2/+5
* | | Merge pull request #4114 from jupierce/move_imagesScott Dodson2017-05-088-0/+0
|\ \ \
| * | | Moving Dockerfile content to images dirjupierce2017-05-088-0/+0
|/ / /
* | | Automatic commit of package [openshift-ansible] release [3.6.57-1].Jenkins CD Merge Bot2017-05-082-2/+5
* | | Automatic commit of package [openshift-ansible] release [3.6.56-1].Jenkins CD Merge Bot2017-05-072-2/+5
* | | Automatic commit of package [openshift-ansible] release [3.6.55-1].Jenkins CD Merge Bot2017-05-062-2/+10
| |/ |/|
* | Merge pull request #4103 from ganhuang/fix_container_engineOpenShift Bot2017-05-056-24/+27
|\ \
| * | Fix 1448368, and some other minors issuesGan Huang2017-05-056-24/+27
* | | Merge pull request #4093 from richm/mux-result-startup-fixScott Dodson2017-05-052-2/+2
|\ \ \
| * | | mux startup is broken without this fixRich Megginson2017-05-042-2/+2
* | | | Merge pull request #3720 from giuseppe/installer-system-containerScott Dodson2017-05-0510-0/+313
|\ \ \ \
| * | | | Dockerfile: create symlink for /opt/app-root/srcGiuseppe Scrivano2017-05-031-0/+6
| * | | | docs: Add basic system container dev docsSteve Milner2017-05-033-0/+55
| * | | | installer: Add system container variable for log savingSteve Milner2017-05-034-0/+13
| * | | | installer: support running as a system containerGiuseppe Scrivano2017-05-037-0/+239
* | | | | Automatic commit of package [openshift-ansible] release [3.6.54-1].Jenkins CD Merge Bot2017-05-052-2/+9
| |_|/ / |/| | |
* | | | Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-commonJan Chaloupka2017-05-044-2/+6
|\ \ \ \
| * | | | move etcdctl.yml from etcd to etcd_common roleJan Chaloupka2017-05-034-2/+6
* | | | | Merge pull request #4044 from mtnbikenc/clean-cacheOpenShift Bot2017-05-042-11/+17
|\ \ \ \ \
| * | | | | Ensure repo cache is clean on the first runRussell Teague2017-05-032-11/+17
* | | | | | Merge pull request #4089 from mtnbikenc/unicode-decodeOpenShift Bot2017-05-0428-28/+28
|\ \ \ \ \ \
| * | | | | | Allow oc_ modules to pass unicode resultsRussell Teague2017-05-0328-28/+28
* | | | | | | Merge pull request #4071 from ewolinetz/cherry_pick_htpasswdOpenShift Bot2017-05-042-11/+14
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Modified pick from release-1.5 for updating hawkular htpasswd generationewolinetz2017-05-022-11/+14
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.53-1].Jenkins CD Merge Bot2017-05-042-2/+14
* | | | | | | Merge pull request #4085 from ewolinetz/pick_issue4083OpenShift Bot2017-05-035-14/+2
|\ \ \ \ \ \ \
| * | | | | | | Correctly setting the primary and replica shard count settingsewolinetz2017-05-035-14/+2
* | | | | | | | Merge pull request #4049 from ashcrow/system-container-dockerOpenShift Bot2017-05-0317-122/+394
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | System container dockerSteve Milner2017-05-0317-122/+394
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #4080 from dgoodwin/aws-cred-no-logOpenShift Bot2017-05-031-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Stop logging AWS credentials in master role.Devan Goodwin2017-05-031-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #4062 from abutcher/atomicf25OpenShift Bot2017-05-033-9/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove set operations from openshift_master_certificates iteration.Andrew Butcher2017-05-021-4/+4
| * | | | | | Refactor system fact gathering to avoid dictionary size change during iteration.Andrew Butcher2017-05-021-3/+5
| * | | | | | Refactor secret generation for python3.Andrew Butcher2017-05-021-2/+2
* | | | | | | Merge pull request #4011 from jlebon/pr/rhci-fixesOpenShift Bot2017-05-032-4/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |