Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ | |||||
* | | 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 #6031 from abutcher/temporary-servinginfo-clientca | OpenShift Merge Robot | 2017-11-06 | 2 | -1/+31 |
|\ \ \ | |||||
| * | | | Temporarily set master servingInfo.clientCA as client-ca-bundle.crt during ro... | Andrew Butcher | 2017-11-06 | 2 | -1/+31 |
* | | | | 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 | 5 | -7/+30 |
|\ \ \ \ \ | |||||
| * | | | | | Retry restarting master controllers | Michael Gugino | 2017-11-06 | 5 | -7/+30 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #6030 from giuseppe/fix-selinux-docker-too | OpenShift Merge Robot | 2017-11-06 | 2 | -4/+9 |
|\ \ \ \ \ | |||||
| * | | | | | container-engine: ensure /var/lib/containers/ is properly labelled | Giuseppe Scrivano | 2017-11-06 | 2 | -4/+9 |
* | | | | | | Merge pull request #6007 from kwoodson/container_location | OpenShift Merge Robot | 2017-11-06 | 2 | -0/+48 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Moving docker location to share path with system containers. | Kenny Woodson | 2017-11-06 | 2 | -0/+48 |
* | | | | | | | Merge pull request #6026 from fabianvf/1509680-asb-credential-check | Scott Dodson | 2017-11-06 | 4 | -5/+7 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Bug 1509680- Fix ansible-service-broker registry validations | Fabian von Feilitzsch | 2017-11-06 | 4 | -5/+7 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #5994 from djzager/bz1509052-broker-logfile | Scott Dodson | 2017-11-06 | 1 | -1/+0 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Bug 1509052 - Remove logfile from broker config | David Zager | 2017-11-02 | 1 | -1/+0 |
* | | | | | | Merge pull request #5988 from mgugino-upstream-stage/github-auth-fix | Scott Dodson | 2017-11-06 | 1 | -4/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix github auth validation | Michael Gugino | 2017-11-02 | 1 | -4/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #5836 from jkroepke/issue_5835 | Scott Dodson | 2017-11-06 | 2 | -2/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Re-generate lib_openshift | Jan-Otto Kröpke | 2017-10-25 | 1 | -1/+1 |
| * | | | | | Remove provisioner restrictions on oc_storageclass | Jan-Otto Kröpke | 2017-10-22 | 1 | -1/+1 |
* | | | | | | Merge pull request #6010 from fabianvf/1507787-asb-fix-ocp-defaults | Scott Dodson | 2017-11-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Bug 1507787- add full path to default asb etcd image | Fabian von Feilitzsch | 2017-11-03 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Revert "Bootstrap enhancements." | Clayton Coleman | 2017-11-05 | 23 | -321/+273 |
* | | | | | | Merge pull request #5991 from tbielawa/gate_cfme | OpenShift Merge Robot | 2017-11-04 | 2 | -4/+64 |
|\ \ \ \ \ \ | |||||
| * | | | | | | management: enterprise users must acknowledge use of beta software | Tim Bielawa | 2017-11-03 | 2 | -4/+64 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #6006 from mgugino-upstream-stage/elb-v2 | OpenShift Merge Robot | 2017-11-03 | 23 | -273/+321 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Bootstrap enhancements. | Kenny Woodson | 2017-11-03 | 23 | -273/+321 |
* | | | | | | | Merge pull request #6005 from mgugino-upstream-stage/fix-master-version-detect | OpenShift Merge Robot | 2017-11-03 | 2 | -1/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix master upgrade version detect and systemd enable | Michael Gugino | 2017-11-03 | 2 | -1/+12 |
* | | | | | | | | Merge pull request #5983 from ewolinetz/37_bz1508150 | OpenShift Merge Robot | 2017-11-03 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Using the currently attached pvc for an ES dc if available, otherwise falling... | Eric Wolinetz | 2017-11-01 | 1 | -2/+2 |
* | | | | | | | | Merge pull request #5959 from sdodson/sc-asb-tsb-on-by-default | OpenShift Merge Robot | 2017-11-03 | 6 | -10/+28 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | |