summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4678 from tbielawa/bz1467776OpenShift Bot2017-07-051-1/+3
|\
| * Fix missing service domain .svc in NO_PROXY settingsTim Bielawa2017-07-051-1/+3
* | Merge pull request #4679 from sdodson/svc-catalog-tagScott Dodson2017-07-051-1/+1
|\ \ | |/ |/|
| * Update the tag for enterprise service catalogScott Dodson2017-07-051-1/+1
|/
* Merge pull request #4664 from sdodson/service-catalog-imagesScott Dodson2017-07-052-2/+2
|\
| * Fix prefix for OCP service-catalog prefixScott Dodson2017-07-031-1/+1
| * Fully qualify ocp ansible_service_broker_image_prefixScott Dodson2017-07-031-1/+1
* | Merge pull request #4674 from ingvagabund/drop-etcdctl-before-etcd_container-...Jan Chaloupka2017-07-052-7/+7
|\ \
| * | drop etcdctl before the etcd_container serviceJan Chaloupka2017-07-042-7/+7
* | | Automatic commit of package [openshift-ansible] release [3.6.134-1].Jenkins CD Merge Bot2017-07-052-2/+5
|/ /
* | Automatic commit of package [openshift-ansible] release [3.6.133-1].Jenkins CD Merge Bot2017-07-042-2/+11
* | Merge pull request #4668 from giuseppe/etcd-system-container-fix-migrationOpenShift Bot2017-07-031-2/+5
|\ \
| * | etcd, syscontainer: fix copy of existing datastoreGiuseppe Scrivano2017-07-031-2/+5
* | | Merge pull request #4666 from ingvagabund/pre-pull-docker-images-before-stopp...OpenShift Bot2017-07-032-15/+14
|\ \ \
| * | | pre-pull images before stopping dockerJan Chaloupka2017-07-032-15/+14
| | |/ | |/|
* | | Merge pull request #3131 from sdodson/no_proxy_bz1414749_bz1414748OpenShift Bot2017-07-031-18/+27
|\ \ \
| * | | Always convert no_proxy from string into a listScott Dodson2017-07-031-18/+27
* | | | Merge pull request #4656 from jcantrill/bz1466680_fix_alt_log_namespaceOpenShift Bot2017-07-031-0/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix 1466680. Fix logging deploying to the specified namespaceJeff Cantrill2017-06-301-0/+4
* | | | Merge pull request #4533 from sdodson/storage-migration-fixesOpenShift Bot2017-07-031-6/+12
|\ \ \ \
| * | | | Fixes to storage migrationScott Dodson2017-06-221-6/+12
* | | | | Merge pull request #4641 from wozniakjan/logging_es_probeOpenShift Bot2017-07-031-10/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | logging_es: temporarily disable readiness probeJan Wozniak2017-06-291-10/+0
* | | | | Automatic commit of package [openshift-ansible] release [3.6.132-1].Jenkins CD Merge Bot2017-07-032-2/+5
* | | | | Automatic commit of package [openshift-ansible] release [3.6.131-1].Jenkins CD Merge Bot2017-07-022-2/+41
* | | | | Merge pull request #4530 from sdodson/node-dnsScott Dodson2017-07-0126-64/+163
|\ \ \ \ \
| * | | | | Fix upgradeScott Dodson2017-06-301-0/+11
| * | | | | Prevent the script to use default route ip as upstream nameserver.Steve Teuber2017-06-301-1/+2
| * | | | | Use default ports for dnsmasq and node dnsScott Dodson2017-06-3011-11/+9
| * | | | | Run dns on the node and use that for dnsmasqScott Dodson2017-06-3027-63/+152
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4658 from abutcher/openshift-default-registryOpenShift Bot2017-07-011-0/+5
|\ \ \ \ \
| * | | | | Set OPENSHIFT_DEFAULT_REGISTRY in registry dc.Andrew Butcher2017-06-301-0/+5
* | | | | | Merge pull request #4655 from sosiouxme/20170630-atomic-etcd-bz1466622OpenShift Bot2017-06-302-1/+16
|\ \ \ \ \ \
| * | | | | | docker_image_availability: fix containerized etcdLuke Meyer2017-06-302-1/+16
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #3813 from ewolinetz/role_decomposition_proposalScott Dodson2017-06-301-0/+353
|\ \ \ \ \ \
| * | | | | | Adding some more sections to additional considerations, being less rigid on l...ewolinetz2017-04-271-2/+40
| * | | | | | Updating snippet contents, formatting and providing urlsewolinetz2017-04-211-35/+28
| * | | | | | Update snippets and add bullet point on role dependencyewolinetz2017-04-051-0/+81
| * | | | | | Creating initial proposal doc for reviewewolinetz2017-03-301-0/+241
* | | | | | | Merge pull request #4607 from sosiouxme/20170627-docker-storage-vgs-unitsOpenShift Bot2017-06-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | docker_storage check: make vgs return sane outputLuke Meyer2017-06-271-1/+1
* | | | | | | | Merge pull request #4659 from sdodson/image-stream-syncScott Dodson2017-06-30325-2101/+34994
|\ \ \ \ \ \ \ \
| * | | | | | | | Update v1.4 image streams and templatesScott Dodson2017-06-3034-215/+3163
| * | | | | | | | xPaaS v1.4.0 for v3.4Scott Dodson2017-06-3080-553/+9869
| * | | | | | | | Sync latest image streams and templates for v1.5Scott Dodson2017-06-3032-208/+2205
| * | | | | | | | xPaaS v1.4.0 for v3.5Scott Dodson2017-06-3080-553/+9869
| * | | | | | | | Update latest image streams for v3.6Scott Dodson2017-06-3018-18/+18
| * | | | | | | | Bump xPaas v1.4.0 for v3.6Scott Dodson2017-06-3081-554/+9870
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #4660 from ewolinetz/bz1466233Scott Dodson2017-06-302-3/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Using ca-bundle.crt to connect to local etcd if master.etcd-ca.crt DNEewolinetz2017-06-302-1/+8