Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge pull request #6923 from openshift/revert-6913-revert-6830-registry_addr | OpenShift Merge Robot | 2018-01-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Revert "Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to... | Ben Parees | 2018-01-29 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #6860 from jpeeler/aggregate-name-change | Scott Dodson | 2018-01-29 | 4 | -106/+97 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Change catalog roles install to use aggregation | Jeff Peeler | 2018-01-24 | 4 | -106/+97 | |
* | | | | | | | | | | | | | | Merge pull request #6889 from mazzystr/fix-port-alignment | OpenShift Merge Robot | 2018-01-29 | 4 | -63/+76 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix misaligned ports for sg,elb,api | Chris Callegari | 2018-01-25 | 4 | -63/+76 | |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #6215 from sdodson/bz1511870 | OpenShift Merge Robot | 2018-01-29 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Make IP object a string | Fabian von Feilitzsch | 2018-01-24 | 1 | -1/+2 | |
| * | | | | | | | | | | | | Add kube service ipaddress to no_proxy list | Scott Dodson | 2018-01-24 | 1 | -0/+3 | |
* | | | | | | | | | | | | | Merge pull request #6909 from spadgett/detect-cro | OpenShift Merge Robot | 2018-01-29 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Bug 1539182: Detect if ClusterResourceOverrides enabled during console install | Samuel Padgett | 2018-01-27 | 1 | -1/+6 | |
* | | | | | | | | | | | | | Merge pull request #6811 from mjudeikis/prometheus-new-template | OpenShift Merge Robot | 2018-01-29 | 7 | -142/+273 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Rebase Prometheus example for new scrape endpoints and expose alert manager | Mangirdas | 2018-01-28 | 7 | -142/+273 | |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the... | Ben Parees | 2018-01-27 | 1 | -1/+1 | |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #6905 from mgugino-upstream-stage/fix-crt-typo | OpenShift Merge Robot | 2018-01-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix container_runtime variable typo | Michael Gugino | 2018-01-26 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #6896 from mgugino-upstream-stage/fix-upgrade-image-tag | OpenShift Merge Robot | 2018-01-26 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Correct 3.7 to 3.9 upgrade openshift_image_tag | Michael Gugino | 2018-01-26 | 2 | -2/+5 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #6840 from yocum137/rm_origin-components | OpenShift Merge Robot | 2018-01-26 | 12 | -7/+438 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:openshift/openshift-ansible into rm_origi... | Dan Yocum | 2018-01-26 | 55 | -325/+1185 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | files in ansible roles do not need to have the path specified to them | Dan Yocum | 2018-01-24 | 5 | -7/+3 | |
| * | | | | | | | | | | | | | Merge branch 'master' into rm_origin-components | Dan Yocum | 2018-01-24 | 70 | -1047/+5400 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | moving files to their correct <role>/files dir for the openshift_web_console ... | Dan Yocum | 2018-01-23 | 9 | -2/+430 | |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #6888 from kwoodson/fix_overlay_nodrive | OpenShift Merge Robot | 2018-01-26 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Removing dependency on the extra stroage device. | Kenny Woodson | 2018-01-25 | 2 | -1/+5 | |
* | | | | | | | | | | | | | Merge pull request #6871 from joelddiaz/oc_group_ignore_users | OpenShift Merge Robot | 2018-01-26 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | ignore 'users' field in oc_group module | Joel Diaz | 2018-01-25 | 2 | -2/+2 | |
* | | | | | | | | | | | | | Merge pull request #6862 from ewolinetz/deprecate_use_callback | OpenShift Merge Robot | 2018-01-26 | 2 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Updating deprecations to use callback plugin | Eric Wolinetz | 2018-01-25 | 3 | -4/+11 | |
* | | | | | | | | | | | | | | Merge pull request #6882 from spadgett/console-node-selector | OpenShift Merge Robot | 2018-01-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Run console pods on the master | Samuel Padgett | 2018-01-25 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #6821 from spadgett/remove-asset-config | Scott Dodson | 2018-01-26 | 4 | -2/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Remove old assetConfig from master-config.yaml | Samuel Padgett | 2018-01-25 | 3 | -2/+21 | |
| * | | | | | | | | | | | | | Don't emit assetConfig on 3.9 | Scott Dodson | 2018-01-25 | 1 | -0/+3 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #6880 from sosiouxme/20180115-docker-image-locations | OpenShift Merge Robot | 2018-01-26 | 2 | -13/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | docker_image_availability: containerized overrides | Luke Meyer | 2018-01-25 | 2 | -13/+47 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #6857 from mtnbikenc/fix-1537946 | OpenShift Merge Robot | 2018-01-25 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | [1537946] Correct conditional check for GlusterFS IPs | Russell Teague | 2018-01-24 | 1 | -1/+2 | |
* | | | | | | | | | | | | | Merge pull request #6875 from bparees/sync | OpenShift Merge Robot | 2018-01-25 | 21 | -127/+746 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | sync imagestreams+templates from origin master for v3.9 | Ben Parees | 2018-01-25 | 21 | -127/+746 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #6859 from abutcher/bz1536217 | OpenShift Merge Robot | 2018-01-25 | 1 | -0/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Redeploy etcd certificates during upgrade when etcd hostname not present in e... | Andrew Butcher | 2018-01-24 | 1 | -0/+53 | |
* | | | | | | | | | | | | | Merge pull request #6878 from mtnbikenc/fix-1502838 | OpenShift Merge Robot | 2018-01-25 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | [1502838] Correct certificate alt name parsing | Russell Teague | 2018-01-25 | 1 | -3/+4 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #6865 from giuseppe/node-specify-bind-option | Scott Dodson | 2018-01-25 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | node: specify bind option to /root/.docker | Giuseppe Scrivano | 2018-01-25 | 1 | -0/+1 | |
* | | | | | | | | | | | | Merge pull request #6734 from ewolinetz/logging_red_restart_check | Scott Dodson | 2018-01-25 | 3 | -71/+97 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Only automatically restart if cluster is in yellow or green state | Eric Wolinetz | 2018-01-24 | 3 | -71/+97 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #6841 from sdodson/bz1491100 | OpenShift Merge Robot | 2018-01-25 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Set a default for openshift_hosted_registry_storage_azure_blob_realm | Scott Dodson | 2018-01-23 | 1 | -0/+2 | |
| |/ / / / / / / / / / |