summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #4673 from enoodle/allow_manageiq_to_read_logsScott Dodson2017-08-042-2/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | adding pods/logs to manageiq roleErez Freiberger2017-08-032-2/+8
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #4978 from ewolinetz/bz1477440Scott Dodson2017-08-042-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixing SA and clusterrole namespacesewolinetz2017-08-022-2/+2
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #4964 from abutcher/py3-expiryOpenShift Bot2017-08-042-35/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Paren wrap integration print().Andrew Butcher2017-08-011-1/+1
| * | | | | | | | | | Update openshift_cert_expiry for py3 support.Andrew Butcher2017-08-011-34/+14
* | | | | | | | | | | Merge pull request #4996 from jkaurredhat/installer-1.7Scott Dodson2017-08-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Quick Installer should specify which config file to edit.jkaurredhat2017-08-041-1/+1
* | | | | | | | | | | | Merge pull request #4992 from ilackarms/cfme-take2Scott Dodson2017-08-043-41/+50
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | nfs only run if cloud_provider not definedScott Weiss2017-08-033-41/+50
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5003 from sosiouxme/20170804-oc-clientScott Dodson2017-08-043-3/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Origin image build: add oc clientLuke Meyer2017-08-043-3/+33
* | | | | | | | | | | | | Merge pull request #4925 from ingvagabund/set-openshift_version-to-openshift_...OpenShift Bot2017-08-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Set the openshift_version from the openshift.common.version in case it is emptyJan Chaloupka2017-07-281-1/+1
* | | | | | | | | | | | | | Merge pull request #4999 from jarrpa/null-file-fixScott Dodson2017-08-043-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | GlusterFS: Don't use /dev/null for empty file.Jose A. Rivera2017-08-043-4/+5
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5002 from sdodson/v37Scott Dodson2017-08-042-0/+248
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add v3.7 hosted templatesScott Dodson2017-08-042-0/+248
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #4789 from ingvagabund/allow-to-specify-docker-registry-fo...Jan Chaloupka2017-08-043-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | allow to specify docker registry for system containersJan Chaloupka2017-07-193-8/+8
* | | | | | | | | | | | | Merge pull request #4988 from stevekuznetsov/skuznets/tolerate-3.7Scott Dodson2017-08-03177-11/+96054
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Default gte_3_7 to falseScott Dodson2017-08-031-1/+1
| * | | | | | | | | | | | Add v3.7 contentScott Dodson2017-08-03173-2/+96035
| * | | | | | | | | | | | Update version checks to tolerate 3.7Steve Kuznetsov2017-08-034-9/+19
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3043 from jkhelil/scaleup_etcdScott Dodson2017-08-0211-15/+84
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add etcd scaleup playbookjawed2017-06-1511-15/+84
* | | | | | | | | | | | | Merge pull request #4981 from jarrpa/heketi-key-fixScott Dodson2017-08-021-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | GlusterFS: Copy SSH private key to master node.Jose A. Rivera2017-08-021-1/+6
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4969 from sosiouxme/20170801-tolerate-ovs-beyond-36OpenShift Bot2017-08-022-90/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | package_version check: tolerate release version 3.7Luke Meyer2017-08-022-90/+80
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4968 from sdodson/cfme-imagesOpenShift Bot2017-08-022-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use enterprise images for CFME enterprise deploymentsScott Dodson2017-08-012-1/+13
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4976 from kprabhak/kp-calico-updatesScott Dodson2017-08-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Missing spaceKarthik Prabhakar2017-08-021-1/+1
* | | | | | | | | | | | | Merge pull request #4850 from kwoodson/normalize_logging_entryScott Dodson2017-08-023-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Normalize logging entry.Kenny Woodson2017-07-243-5/+5
* | | | | | | | | | | | | Merge pull request #4958 from sdodson/logging-metrics-imagetagScott Dodson2017-08-022-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Switch logging and metrics OCP image tag from 3.6.0 to v3.6Scott Dodson2017-08-012-2/+2
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4592 from juanvallejo/jvallejo/verify-fluentd-logging-configOpenShift Bot2017-08-0211-109/+563
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add fluentd logging driver config checkjuanvallejo2017-08-0111-109/+563
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4916 from richm/mux-client-modeOpenShift Bot2017-08-028-13/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use mux_client_mode instead of use_mux_clientRich Megginson2017-08-018-13/+27
* | | | | | | | | | | | | | Merge pull request #4949 from carlpett/patch-1OpenShift Bot2017-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix aws_secret_key checkCalle Pettersson2017-07-311-1/+1
* | | | | | | | | | | | | | | Merge pull request #4961 from jarrpa/minor-namespace-fixScott Dodson2017-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | GlusterFS: Check for namespace if deploying a StorageClassJose A. Rivera2017-08-011-1/+1
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #4894 from tbielawa/reg-dns-scaleup-bz1469336OpenShift Bot2017-08-016-7/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use existing OPENSHIFT_DEFAULT_REGISTRY setting during masters scaleupTim Bielawa2017-07-286-7/+70
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #4700 from sdodson/rate-limitOpenShift Bot2017-08-013-4/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |