summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5804 from smarterclayton/increase_timeoutScott Dodson2017-10-181-1/+1
|\
| * Wait longer for stable GCP instancesClayton Coleman2017-10-181-1/+1
|/
* Automatic commit of package [openshift-ansible] release [3.7.0-0.161.0].Jenkins CD Merge Bot2017-10-182-2/+5
* Automatic commit of package [openshift-ansible] release [3.7.0-0.160.0].Jenkins CD Merge Bot2017-10-182-2/+10
* Merge pull request #5789 from zgalor/fix_limit_typoScott Dodson2017-10-181-1/+1
|\
| * Fix typo in setting prom-proxy memory limitZohar Galor2017-10-181-1/+1
* | Merge pull request #5791 from zgalor/fix_selector_defaultScott Dodson2017-10-181-3/+3
|\ \ | |/ |/|
| * Fix pvc selector default to be empty dict instead of stringZohar Galor2017-10-181-3/+3
|/
* Merge pull request #5361 from kwoodson/fix_bootstrap_filesScott Dodson2017-10-1824-93/+429
|\
| * Do not remove files for bootstrap if resolv or dns.Kenny Woodson2017-10-1724-93/+429
* | Merge pull request #5459 from zgalor/nfs_fixScott Dodson2017-10-1816-353/+1201
|\ \
| * | Fix prometheus role nfsZohar Galor2017-10-1616-353/+1201
* | | Merge pull request #5774 from mgugino-upstream-stage/docker-option-fixScott Dodson2017-10-182-5/+7
|\ \ \
| * | | Fix missing docker option signature-verificationMichael Gugino2017-10-162-5/+7
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.159.0].Jenkins CD Merge Bot2017-10-182-2/+20
* | | | Merge pull request #5785 from sdodson/tsb-rpm-fixScott Dodson2017-10-171-0/+4
|\ \ \ \
| * | | | Updating openshift-ansible.spec file to include files dirScott Dodson2017-10-171-0/+4
|/ / / /
* | | | Merge pull request #5730 from sdodson/restart-controllersScott Dodson2017-10-172-0/+30
|\ \ \ \
| * | | | Restart all controllers to force reconfiguration during upgradeScott Dodson2017-10-112-0/+30
* | | | | Merge pull request #5754 from ewolinetz/bz1501831Scott Dodson2017-10-175-87/+103
|\ \ \ \ \
| * | | | | Reverting proxy image version to v1.0.0 to pass CIEric Wolinetz2017-10-161-1/+1
| * | | | | Making travis happyEric Wolinetz2017-10-161-83/+83
| * | | | | Updating pattern for elasticsearch_proxy imagesEric Wolinetz2017-10-134-3/+17
| * | | | | Updating ES proxy image prefix and version to match other componentsEric Wolinetz2017-10-133-4/+6
* | | | | | Merge pull request #5777 from wozniakjan/eventrouter_bug1501768Scott Dodson2017-10-171-2/+2
|\ \ \ \ \ \
| * | | | | | Bug 1501768: fix eventrouter nodeSelector paddingJan Wozniak2017-10-171-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5765 from abutcher/service-serving-cert-typoOpenShift Merge Robot2017-10-175-2/+42
|\ \ \ \ \ \
| * | | | | | Ensure controllerConfig.serviceServingCert is correctly set during upgrade.Andrew Butcher2017-10-135-2/+42
* | | | | | | Merge pull request #5768 from giuseppe/crio-error-out-with-node-docker-containerOpenShift Merge Robot2017-10-171-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | cri-o: error out when node is a Docker containerGiuseppe Scrivano2017-10-161-0/+6
* | | | | | | Merge pull request #5687 from jim-minter/tsb_configOpenShift Merge Robot2017-10-174-10/+23
|\ \ \ \ \ \ \
| * | | | | | | Rewire openshift_template_service_broker_namespaces configurableJim Minter2017-10-134-10/+23
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5744 from mgugino-upstream-stage/latest-image-configOpenShift Merge Robot2017-10-174-2/+8
|\ \ \ \ \ \ \
| * | | | | | | Add ability to set node and master imageConfig to latestMichael Gugino2017-10-124-2/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.158.0].Jenkins CD Merge Bot2017-10-172-2/+7
* | | | | | | Merge pull request #5704 from josefkarasek/docker-auditOpenShift Merge Robot2017-10-164-1/+32
|\ \ \ \ \ \ \
| * | | | | | | Add switch to enable/disable container engine's audit log being stored in ES.Josef Karasek2017-10-114-1/+32
* | | | | | | | Merge pull request #5734 from mtnbikenc/refactor-mgmt-entryOpenShift Merge Robot2017-10-166-31/+22
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Refactor openshift-management entry pointRussell Teague2017-10-126-31/+22
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.157.0].Jenkins CD Merge Bot2017-10-162-2/+6
* | | | | | | | Merge pull request #5733 from ingvagabund/data-migrate-of-embedded-etcd-not-a...OpenShift Merge Robot2017-10-161-6/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | data migration of embedded etcd not allowedJan Chaloupka2017-10-121-6/+18
| |/ / / / / /
* | | | | | | Merge pull request #5667 from jarrpa/deploy-heketi-fix-3.7Scott Dodson2017-10-161-8/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | GlusterFS: remove topology reference from deploy-heketiJose A. Rivera2017-10-041-8/+0
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.156.0].Jenkins CD Merge Bot2017-10-162-2/+6
* | | | | | | Merge pull request #5747 from ingvagabund/set-initial-etcd-cluster-properly-s...OpenShift Merge Robot2017-10-153-3/+4
|\ \ \ \ \ \ \
| * | | | | | | set initial etcd cluster properly during system container scale upJan Chaloupka2017-10-133-3/+4
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.155.0].Jenkins CD Merge Bot2017-10-152-2/+5
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.154.0].Jenkins CD Merge Bot2017-10-142-2/+5
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.153.0].Jenkins CD Merge Bot2017-10-132-2/+5