Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5966 from sdodson/iss-master | Scott Dodson | 2017-11-08 | 143 | -25707/+2564 |
|\ | |||||
| * | General template updates for v3.7 | Scott Dodson | 2017-11-08 | 11 | -65/+35 |
| * | Update to xPaaS v1.4.6 | Scott Dodson | 2017-11-08 | 132 | -25642/+2529 |
* | | Merge pull request #6060 from zgalor/change_default_namespace | Scott Dodson | 2017-11-08 | 1 | -1/+1 |
|\ \ | |||||
| * | | Change prometheus default namespace to 'openshift-metrics' | Zohar Galor | 2017-11-08 | 1 | -1/+1 |
* | | | Merge pull request #6059 from fabianvf/1511044-fix-asb-cert-lookup | Scott Dodson | 2017-11-08 | 1 | -3/+12 |
|\ \ \ | |||||
| * | | | Bug 1511044- Slurp the etcd certs instead of using the lookup | Fabian von Feilitzsch | 2017-11-08 | 1 | -3/+12 |
| |/ / | |||||
* | / | Automatic commit of package [openshift-ansible] release [3.7.2-1]. | Jenkins CD Merge Bot | 2017-11-08 | 2 | -2/+8 |
| |/ |/| | |||||
* | | Merge pull request #6061 from zgalor/remove_debug | Scott Dodson | 2017-11-08 | 1 | -9/+0 |
|\ \ | |||||
| * | | Remove debug code that was mistakenly committed | Zohar Galor | 2017-11-08 | 1 | -9/+0 |
| |/ | |||||
* | | Merge pull request #6035 from staebler/1499413-service_catalog_class_and_plan... | Scott Dodson | 2017-11-08 | 1 | -0/+2 |
|\ \ | |||||
| * | | Give service-catalog controller-manager permissions to update status of Clust... | staebler | 2017-11-06 | 1 | -0/+2 |
* | | | Merge pull request #6055 from sdodson/bz1510746 | Scott Dodson | 2017-11-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Correct service restart command | Scott Dodson | 2017-11-08 | 1 | -1/+1 |
* | | | | Automatic commit of package [openshift-ansible] release [3.7.1-1]. | Jenkins CD Merge Bot | 2017-11-08 | 2 | -3/+6 |
| |_|/ |/| | | |||||
* | | | Merge pull request #6052 from fabianvf/1510636-asb-local-registry-name | Scott Dodson | 2017-11-08 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | Bug 1510636- add name to local registry config | Fabian von Feilitzsch | 2017-11-07 | 1 | -3/+4 |
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.198.0]. | Jenkins CD Merge Bot | 2017-11-08 | 2 | -2/+23 |
* | | | | Merge pull request #6023 from Miciah/bz1509163-openshift_checks-add-ovs-versi... | Scott Dodson | 2017-11-07 | 3 | -3/+6 |
|\ \ \ \ | |||||
| * | | | | openshift_checks: Add OVS versions for OCP 3.7 | Miciah Masters | 2017-11-06 | 3 | -3/+6 |
* | | | | | Merge pull request #5903 from sdodson/dotnet-centos | Scott Dodson | 2017-11-07 | 4 | -4/+113 |
|\ \ \ \ \ | |||||
| * | | | | | Add centos based dotnet 2.0 image streams | Scott Dodson | 2017-10-27 | 4 | -4/+113 |
* | | | | | | Merge pull request #6042 from sdodson/image-stream-sync | Scott Dodson | 2017-11-07 | 2 | -19/+511 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix v3.6 xpaas image streams | Scott Dodson | 2017-11-07 | 1 | -9/+307 |
| * | | | | | | Fix v3.7 xpaas image streams | Scott Dodson | 2017-11-07 | 1 | -10/+204 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #6046 from mgugino-upstream-stage/fix-github-challenge-auth | Scott Dodson | 2017-11-07 | 1 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Re-add challenge auth verification to github and google | Michael Gugino | 2017-11-07 | 1 | -0/+12 |
* | | | | | | | Merge pull request #6047 from sdodson/kubectl | Scott Dodson | 2017-11-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use oc rather than kubectl | Scott Dodson | 2017-11-07 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #6050 from ashcrow/possible-fix-for-scott | Scott Dodson | 2017-11-07 | 1 | -1/+28 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | container_binary_sync: Remove atomic prefix from image | Steve Milner | 2017-11-07 | 1 | -1/+28 |
* | | | | | | | Merge pull request #6040 from kwoodson/router_shard_custom_cert_fix | Scott Dodson | 2017-11-07 | 1 | -3/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | [Bug 1509354] Check if routers have certificates and use them | Kenny Woodson | 2017-11-07 | 1 | -3/+6 |
* | | | | | | | Merge pull request #6048 from fabianvf/1510546-asb-fix-cert-indent | Scott Dodson | 2017-11-07 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bug 1510546- Fix previous fix, task was indented one level too deep | Fabian von Feilitzsch | 2017-11-07 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #6044 from fabianvf/1510546-asb-fix-cert-conditional | Scott Dodson | 2017-11-07 | 1 | -11/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move fact definition that breaks when check to end of block | Fabian von Feilitzsch | 2017-11-07 | 1 | -11/+11 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #6036 from mgugino-upstream-stage/fix-prometheus-vars | OpenShift Merge Robot | 2017-11-07 | 4 | -49/+48 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix prometheus default vars | Michael Gugino | 2017-11-07 | 4 | -49/+48 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #6009 from dymurray/template | OpenShift Merge Robot | 2017-11-07 | 2 | -2/+18 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Proper quotes | Dylan Murray | 2017-11-03 | 1 | -2/+2 |
| * | | | | | | Update service broker configmap and serviceaccount privileges | Dylan Murray | 2017-11-03 | 2 | -2/+18 |
* | | | | | | | Merge pull request #5998 from SaravanaStorageNetwork/fix_for_etcd | Michael Gugino | 2017-11-07 | 5 | -0/+20 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Add etcd as part of inventory file. | Saravanakumar Arumugam | 2017-11-03 | 5 | -0/+20 |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.197.0]. | Jenkins CD Merge Bot | 2017-11-07 | 2 | -2/+15 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #6031 from abutcher/temporary-servinginfo-clientca | OpenShift Merge Robot | 2017-11-06 | 5 | -6/+61 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Temporarily set master servingInfo.clientCA as client-ca-bundle.crt during ro... | Andrew Butcher | 2017-11-06 | 5 | -6/+61 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #5976 from fabianvf/asb-etcd-certs | Scott Dodson | 2017-11-06 | 3 | -13/+174 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Bug 1507617- Move etcd into its own service/dc with SSL | Fabian von Feilitzsch | 2017-11-03 | 3 | -13/+174 |
* | | | | | | | Merge pull request #6027 from mgugino-upstream-stage/retry-restart-master-con... | OpenShift Merge Robot | 2017-11-06 | 7 | -9/+42 |
|\ \ \ \ \ \ \ |