Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5358 from wozniakjan/logging_kibana_ops/default_memory | OpenShift Merge Robot | 2017-09-26 | 1 | -2/+2 |
|\ | |||||
| * | logging: fix kibana and kibana-ops defaults | Jan Wozniak | 2017-09-25 | 1 | -2/+2 |
* | | Merge pull request #5470 from ingvagabund/consolidate-etcd-common-role | OpenShift Merge Robot | 2017-09-26 | 35 | -179/+198 |
|\ \ | |||||
| * | | consolidate etcd_common role | Jan Chaloupka | 2017-09-25 | 35 | -179/+198 |
* | | | Merge pull request #5503 from nhosoi/output_config_test | OpenShift Merge Robot | 2017-09-26 | 2 | -0/+4 |
|\ \ \ | |||||
| * | | | Fluentd: one output tag, one output plugin | Noriko Hosoi | 2017-09-25 | 2 | -0/+4 |
* | | | | Merge pull request #5530 from ewolinetz/bz1487959 | OpenShift Merge Robot | 2017-09-26 | 1 | -4/+16 |
|\ \ \ \ | |||||
| * | | | | Updating to check for netnamespace kube-service-catalog to be ready | Eric Wolinetz | 2017-09-25 | 1 | -4/+16 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #5529 from abutcher/aggregator-api-client-config | OpenShift Merge Robot | 2017-09-26 | 1 | -11/+29 |
|\ \ \ \ | |||||
| * | | | | Generate aggregator api client config in temporary directory. | Andrew Butcher | 2017-09-25 | 1 | -11/+29 |
* | | | | | Merge pull request #5526 from ewolinetz/tsb_pass_image | OpenShift Merge Robot | 2017-09-26 | 3 | -4/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Passing in image parameter for tsb template | Eric Wolinetz | 2017-09-25 | 3 | -4/+10 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #5472 from mgugino-upstream-stage/split-hosted-v2 | OpenShift Merge Robot | 2017-09-26 | 20 | -173/+161 |
|\ \ \ \ \ | |||||
| * | | | | | Refactor openshift_hosted plays and role | Michael Gugino | 2017-09-25 | 20 | -173/+161 |
* | | | | | | Merge pull request #5494 from jcantrill/deprecate_escopy | OpenShift Merge Robot | 2017-09-26 | 5 | -6/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove logging ES_COPY feature | Jeff Cantrill | 2017-09-22 | 5 | -6/+3 |
* | | | | | | | Merge pull request #5519 from giuseppe/crio-set-proper-tag | OpenShift Merge Robot | 2017-09-26 | 2 | -5/+8 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | crio: detect the correct version of the images | Giuseppe Scrivano | 2017-09-25 | 1 | -4/+7 |
| * | | | | | | crio: set the correct image name with OSE | Giuseppe Scrivano | 2017-09-25 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #5269 from rparulek/nuage-ansible | OpenShift Merge Robot | 2017-09-25 | 4 | -19/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Changes for Nuage atomic ansible install | Rohan Parulekar | 2017-09-20 | 4 | -19/+5 |
* | | | | | | | Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regs | OpenShift Merge Robot | 2017-09-25 | 5 | -11/+71 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Move additional/block/insecure registires to /etc/containers/registries.conf | Michael Gugino | 2017-09-21 | 5 | -11/+71 |
* | | | | | | | Merge pull request #5415 from ttindell2/master | OpenShift Merge Robot | 2017-09-25 | 4 | -39/+48 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | GlusterFS can now be run more than once. Ability to add devices to nodes | Tim Tindell | 2017-09-18 | 4 | -39/+48 |
* | | | | | | | Merge pull request #5451 from ingvagabund/consolidate-etcd-upgrade | OpenShift Merge Robot | 2017-09-25 | 10 | -49/+15 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | consolidate etcd_upgrade role | Jan Chaloupka | 2017-09-21 | 10 | -49/+15 |
* | | | | | | | Merge pull request #5492 from jsafrane/local-storage-predicate | OpenShift Merge Robot | 2017-09-25 | 2 | -1/+32 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Add 3.7 scheduler predicates | Jan Safranek | 2017-09-20 | 2 | -1/+32 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #5501 from giuseppe/crio-skip-nfs-and-lb | OpenShift Merge Robot | 2017-09-24 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | crio: skip installation on lbs and nfs nodes | Giuseppe Scrivano | 2017-09-22 | 1 | -0/+1 |
* | | | | | | | Merge pull request #5493 from e-minguez/AnsibleUnsafeText_fix | OpenShift Merge Robot | 2017-09-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed AnsibleUnsafeText by converting to int | Eduardo Minguez | 2017-09-21 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #5502 from mgugino-upstream-stage/fix-undefined-reg-auth | OpenShift Merge Robot | 2017-09-23 | 10 | -26/+80 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix registry_auth logic for upgrades | Michael Gugino | 2017-09-22 | 10 | -26/+80 |
* | | | | | | | | Merge pull request #5460 from ingvagabund/consolidate-etcd-migrate-role | OpenShift Merge Robot | 2017-09-23 | 17 | -98/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | consolidate etcd_migrate role | Jan Chaloupka | 2017-09-22 | 17 | -98/+12 |
* | | | | | | | | | Merge pull request #5384 from joelddiaz/node-fact-filter | OpenShift Merge Robot | 2017-09-23 | 2 | -1/+33 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | move (and rename) get_dns_ip filter into openshift_node_facts | Joel Diaz | 2017-09-12 | 2 | -1/+33 |
* | | | | | | | | | | Merge pull request #5491 from sosiouxme/20170920-diagnostics-check | OpenShift Merge Robot | 2017-09-22 | 7 | -20/+138 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | health checks: add diagnostics check | Luke Meyer | 2017-09-21 | 7 | -20/+138 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5483 from sdodson/bz1396350 | OpenShift Merge Robot | 2017-09-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Ensure that hostname is lowercase | Scott Dodson | 2017-09-21 | 1 | -1/+1 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5511 from ewolinetz/logging_metrics_default_fix | Scott Dodson | 2017-09-22 | 4 | -7/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Updating default behavior for installing metrics and logging. Separating out ... | Eric Wolinetz | 2017-09-22 | 4 | -7/+16 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5496 from mgugino-upstream-stage/remove-hosted-logging | OpenShift Merge Robot | 2017-09-22 | 9 | -349/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove unused openshift_hosted_logging role | Michael Gugino | 2017-09-21 | 9 | -349/+0 |
* | | | | | | | | | | Merge pull request #5176 from ewolinetz/deprecate_log_met_vars | OpenShift Merge Robot | 2017-09-22 | 16 | -112/+376 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Creating structure to warn for use of deprecated variables and set them in a ... | Eric Wolinetz | 2017-09-20 | 16 | -112/+376 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5354 from ashcrow/crio-systemcontainer-image-override | OpenShift Merge Robot | 2017-09-22 | 1 | -8/+12 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | |