summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #6020 from sdodson/asb-tsbScott Dodson2017-11-086-11/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use openshift.common.client_binaryScott Dodson2017-11-082-5/+5
| * | | | | | | | | Remove duplicate defaulting for ASB and TSBScott Dodson2017-11-084-6/+6
| |/ / / / / / / /
* | | | | | | | | Merge pull request #6016 from kwoodson/bootstrap_enhancements-v3Kenny Woodson2017-11-0826-353/+363
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bootstrap enhancements.Kenny Woodson2017-11-0826-353/+363
* | | | | | | | | | Merge pull request #5829 from sosiouxme/20171020-registry-console-bz1497310Scott Dodson2017-11-086-25/+81
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reconcile registry-console and docker_image_availabilityLuke Meyer2017-11-066-25/+81
* | | | | | | | | | | Merge pull request #6063 from mgugino-upstream-stage/upgrade-minor-validator-fixScott Dodson2017-11-082-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix preupgrade authorization objects are in sync minor versionsMichael Gugino2017-11-082-1/+6
* | | | | | | | | | | | Merge pull request #6065 from mgugino-upstream-stage/fix-examples-image-streamsScott Dodson2017-11-082-0/+208
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix examples image streamsMichael Gugino2017-11-082-0/+208
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5966 from sdodson/iss-masterScott Dodson2017-11-08143-25707/+2564
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | General template updates for v3.7Scott Dodson2017-11-0811-65/+35
| * | | | | | | | | | | Update to xPaaS v1.4.6Scott Dodson2017-11-08132-25642/+2529
* | | | | | | | | | | | Merge pull request #6060 from zgalor/change_default_namespaceScott Dodson2017-11-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Change prometheus default namespace to 'openshift-metrics'Zohar Galor2017-11-081-1/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6059 from fabianvf/1511044-fix-asb-cert-lookupScott Dodson2017-11-081-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bug 1511044- Slurp the etcd certs instead of using the lookupFabian von Feilitzsch2017-11-081-3/+12
| |/ / / / / / / / / /
* | / / / / / / / / / Automatic commit of package [openshift-ansible] release [3.7.2-1].Jenkins CD Merge Bot2017-11-082-2/+8
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #6061 from zgalor/remove_debugScott Dodson2017-11-081-9/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove debug code that was mistakenly committedZohar Galor2017-11-081-9/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #6035 from staebler/1499413-service_catalog_class_and_plan...Scott Dodson2017-11-081-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Give service-catalog controller-manager permissions to update status of Clust...staebler2017-11-061-0/+2
* | | | | | | | | | | Merge pull request #6055 from sdodson/bz1510746Scott Dodson2017-11-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Correct service restart commandScott Dodson2017-11-081-1/+1
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.1-1].Jenkins CD Merge Bot2017-11-082-3/+6
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #6052 from fabianvf/1510636-asb-local-registry-nameScott Dodson2017-11-081-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Bug 1510636- add name to local registry configFabian von Feilitzsch2017-11-071-3/+4
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.198.0].Jenkins CD Merge Bot2017-11-082-2/+23
* | | | | | | | | | | Merge pull request #6023 from Miciah/bz1509163-openshift_checks-add-ovs-versi...Scott Dodson2017-11-073-3/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | openshift_checks: Add OVS versions for OCP 3.7Miciah Masters2017-11-063-3/+6
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5903 from sdodson/dotnet-centosScott Dodson2017-11-074-4/+113
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add centos based dotnet 2.0 image streamsScott Dodson2017-10-274-4/+113
* | | | | | | | | | | | Merge pull request #6042 from sdodson/image-stream-syncScott Dodson2017-11-072-19/+511
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix v3.6 xpaas image streamsScott Dodson2017-11-071-9/+307
| * | | | | | | | | | | | Fix v3.7 xpaas image streamsScott Dodson2017-11-071-10/+204
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6046 from mgugino-upstream-stage/fix-github-challenge-authScott Dodson2017-11-071-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Re-add challenge auth verification to github and googleMichael Gugino2017-11-071-0/+12
* | | | | | | | | | | | | Merge pull request #6047 from sdodson/kubectlScott Dodson2017-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use oc rather than kubectlScott Dodson2017-11-071-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6050 from ashcrow/possible-fix-for-scottScott Dodson2017-11-071-1/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | container_binary_sync: Remove atomic prefix from imageSteve Milner2017-11-071-1/+28
* | | | | | | | | | | | | Merge pull request #6040 from kwoodson/router_shard_custom_cert_fixScott Dodson2017-11-071-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | [Bug 1509354] Check if routers have certificates and use themKenny Woodson2017-11-071-3/+6
* | | | | | | | | | | | | Merge pull request #6048 from fabianvf/1510546-asb-fix-cert-indentScott Dodson2017-11-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bug 1510546- Fix previous fix, task was indented one level too deepFabian von Feilitzsch2017-11-071-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #6044 from fabianvf/1510546-asb-fix-cert-conditionalScott Dodson2017-11-071-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move fact definition that breaks when check to end of blockFabian von Feilitzsch2017-11-071-11/+11
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6036 from mgugino-upstream-stage/fix-prometheus-varsOpenShift Merge Robot2017-11-074-49/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix prometheus default varsMichael Gugino2017-11-074-49/+48
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |