summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #5593 from ingvagabund/block-upgrade-if-etcd3-not-setJan Chaloupka2017-09-301-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | block 3.6->3.7 upgrade if storage backend is not set to etcd3Jan Chaloupka2017-09-291-0/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #5565 from mgugino-upstream-stage/provisioning-centos-supportOpenShift Merge Robot2017-09-2912-101/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Changes necessary to support AMI buildingMichael Gugino2017-09-2812-101/+166
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.135.0].Jenkins CD Merge Bot2017-09-302-2/+24
* | | | | | | | | | | | | Merge pull request #5595 from mgugino-upstream-stage/reg-auth-variable-fixOpenShift Merge Robot2017-09-292-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix registry auth variableMichael Gugino2017-09-292-2/+2
* | | | | | | | | | | | | | Merge pull request #5601 from detiber/openshift_repos_fixOpenShift Merge Robot2017-09-294-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | fix whitespace for centos reposJason DeTiberus2017-09-294-4/+4
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5575 from ewolinetz/bz1470623Scott Dodson2017-09-294-2/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Registering the broker for TSBEric Wolinetz2017-09-284-2/+63
* | | | | | | | | | | | | Merge pull request #5577 from ashcrow/1496725OpenShift Merge Robot2017-09-291-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | openshift_facts: coerce docker_use_system_container to boolSteve Milner2017-09-281-1/+3
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5581 from sqtran/formattingScott Dodson2017-09-291-22/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Quick formatting updates to the logging README.stran2017-09-281-22/+22
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5594 from ingvagabund/move-health-checks-and-ctrl-plane-v...Jan Chaloupka2017-09-295-28/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | move health-checks and control-plane-verification before excludersJan Chaloupka2017-09-295-28/+28
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5588 from IshentRas/fix-typoScott Dodson2017-09-292-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fix typo in files (Docker registries)William Burton2017-09-292-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5020 from jsanda/prometheus-endpoint-configOpenShift Merge Robot2017-09-293-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | rename vars to avoid double negatives and ensuing confusionJohn Sanda2017-08-143-6/+6
| * | | | | | | | set prometheus endpoint properties to false by defaultJohn Sanda2017-08-091-2/+2
| * | | | | | | | add options to disable prometheus endpointsJohn Sanda2017-07-243-0/+7
| * | | | | | | | Enable JMX reporting of internal metricsJohn Sanda2017-07-071-0/+1
* | | | | | | | | Merge pull request #5544 from sdodson/aep-b-goneOpenShift Merge Robot2017-09-286-77/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove some reminants of Atomic EnterpriseScott Dodson2017-09-266-77/+8
* | | | | | | | | | Merge pull request #5559 from mgugino-upstream-stage/readd-ent-registryOpenShift Merge Robot2017-09-289-57/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Migrate enterprise registry logic to docker roleMichael Gugino2017-09-279-57/+25
* | | | | | | | | | Merge pull request #5531 from sqtran/remote-syslog-configsOpenShift Merge Robot2017-09-283-0/+115
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | minor update to README and removed dead filestran2017-09-272-215/+18
| * | | | | | | | | | Added new variables for logging role for remote-syslog pluginstran2017-09-274-0/+312
* | | | | | | | | | | Merge pull request #5508 from sdodson/disable-image-streamsOpenShift Merge Robot2017-09-283-3/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Allow examples management to be disabledScott Dodson2017-09-223-3/+5
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.134.0].Jenkins CD Merge Bot2017-09-282-2/+6
* | | | | | | | | | | Merge pull request #5527 from mtnbikenc/installer-checkpointOpenShift Merge Robot2017-09-2821-65/+660
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | OpenShift-Ansible Installer CheckpointingRussell Teague2017-09-2721-65/+660
* | | | | | | | | | | | Merge pull request #5549 from ingvagabund/fix-etcd-backup-tagOpenShift Merge Robot2017-09-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | evaluate etcd_backup_tag variableJan Chaloupka2017-09-271-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.133.0].Jenkins CD Merge Bot2017-09-282-2/+19
* | | | | | | | | | | | Merge pull request #5538 from mgugino-upstream-stage/fix-centos-reposScott Dodson2017-09-276-19/+108
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix origin repo deploymentMichael Gugino2017-09-266-19/+108
* | | | | | | | | | | | | Merge pull request #5518 from ingvagabund/set-quota-backend-bytes-explicitlyOpenShift Merge Robot2017-09-276-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Set the etcd backend quota to 4GB by defaultJan Chaloupka2017-09-266-6/+20
* | | | | | | | | | | | | Merge pull request #5561 from jlebon/pr/papr-test-containerScott Dodson2017-09-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | papr: use F26 container for extended testsJonathan Lebon2017-09-271-1/+2
* | | | | | | | | | | | | | Merge pull request #5556 from vshn/aliastypo1Scott Dodson2017-09-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix typo in drop_etcdctl.ymlMichael Hanselmann2017-09-271-1/+1
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5555 from mtnbikenc/fix-filter-loadingScott Dodson2017-09-274-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Rename filter_plugins to unique namesRussell Teague2017-09-274-0/+0
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5461 from ashcrow/papr-bumpScott Dodson2017-09-271-12/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |