summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3860 from sdodson/backup-v3-dataOpenShift Bot2017-04-251-32/+28
|\
| * Cleanup comments and remove extraneous tasksScott Dodson2017-04-101-23/+7
| * Store backups in /var/lib/etcd/openshift-backupScott Dodson2017-04-101-19/+12
| * Create member/snap directory encase it doesn't existScott Dodson2017-04-071-2/+7
| * Copy v3 data dir when performing backupScott Dodson2017-04-051-1/+15
* | Merge pull request #3970 from mtnbikenc/3_6-upgradeOpenShift Bot2017-04-25138-18/+27
|\ \
| * | Standardize all Origin versioning on 3.6Russell Teague2017-04-25138-18/+27
* | | Merge pull request #3988 from abutcher/router-cert-varsOpenShift Bot2017-04-252-10/+10
|\ \ \
| * | | Replace original router cert variable names.Andrew Butcher2017-04-242-10/+10
* | | | Merge pull request #3968 from jarrpa/oc_obj-kindsOpenShift Bot2017-04-253-14/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | oc_obj: Allow for multiple kinds in deleteJose A. Rivera2017-04-213-14/+8
* | | | Merge pull request #3962 from sdodson/image-stream-syncOpenShift Bot2017-04-256-8/+50
|\ \ \ \
| * | | | Update v1.5 contentScott Dodson2017-04-203-4/+25
| * | | | Update v1.6 contentScott Dodson2017-04-203-4/+25
* | | | | Merge pull request #3911 from ewolinetz/logging_15_picksOpenShift Bot2017-04-255-159/+202
|\ \ \ \ \
| * | | | | Addressing yamllintewolinetz2017-04-131-4/+4
| * | | | | Updating kibana-proxy secret key for server-tls entryewolinetz2017-04-131-1/+1
| * | | | | Pick from issue3896ewolinetz2017-04-134-154/+197
* | | | | | Merge pull request #3998 from openshift/revert-3955-fix_etcd_pathsScott Dodson2017-04-251-1/+1
|\ \ \ \ \ \
| * | | | | | Revert "Add /etc/sysconfig/etcd to etcd_container"Scott Dodson2017-04-251-1/+1
|/ / / / / /
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.37-1].Jenkins CD Merge Bot2017-04-252-2/+7
* | | | | | Merge pull request #3990 from abutcher/custom-router-cert-replace-ngScott Dodson2017-04-251-1/+60
|\ \ \ \ \ \
| * | | | | | Differentiate between service serving router certificate and custom openshift...Andrew Butcher2017-04-241-1/+60
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.36-1].Jenkins CD Merge Bot2017-04-252-2/+13
* | | | | | | Merge pull request #3976 from mtnbikenc/swap-updateOpenShift Bot2017-04-252-16/+26
|\ \ \ \ \ \ \
| * | | | | | | Update swap disable tasksRussell Teague2017-04-212-16/+26
* | | | | | | | Merge pull request #3932 from richm/muxOpenShift Bot2017-04-2414-0/+413
|\ \ \ \ \ \ \ \
| * | | | | | | | cast openshift_logging_use_mux_client to boolRich Megginson2017-04-191-2/+2
| * | | | | | | | mux does not require privileged, only hostmount-anyuidRich Megginson2017-04-1914-0/+413
* | | | | | | | | Merge pull request #3481 from jpkrohling/JPK-SwitchHeapsterToUseGeneratedCertsOpenShift Bot2017-04-245-44/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Switched Heapster to use certificates generated by OpenShiftJuraci Paixão Kröhling2017-04-185-44/+31
* | | | | | | | | | Merge pull request #3906 from sdodson/fix-logging-metrics-templatesOpenShift Bot2017-04-2410-2049/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use metrics and logging deployer tag v3.4 for enterpriseScott Dodson2017-04-102-3/+3
| * | | | | | | | | | Remove v1.5 and v1.6 metrics/logging templatesScott Dodson2017-04-108-2046/+0
* | | | | | | | | | | Merge pull request #3973 from kwoodson/remove_resource_versionOpenShift Bot2017-04-2428-0/+196
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Removing resource version to remove object conflicts caused by race conditions.Kenny Woodson2017-04-2128-0/+196
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.35-1].Jenkins CD Merge Bot2017-04-232-2/+5
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.34-1].Jenkins CD Merge Bot2017-04-212-2/+6
* | | | | | | | | | Merge pull request #3945 from jarrpa/glusterfs-fix-gceOpenShift Bot2017-04-211-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | GlusterFS: provide default for groups.oo_glusterfs_to_config in with_itemsJose A. Rivera2017-04-181-3/+3
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.33-1].Jenkins CD Merge Bot2017-04-212-2/+9
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3944 from pilou-/add_missing_mock_for_oc_binaryOpenShift Bot2017-04-213-10/+35
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Use return_value when value is constantPierre-Louis Bonicoli2017-04-181-8/+2
| * | | | | | | | | Add missing mock for locate_oc_binary methodPierre-Louis Bonicoli2017-04-183-6/+37
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3904 from kwoodson/manageiq_idempotenceyKenny Woodson2017-04-217-103/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding module calls instead of command for idempotency.Kenny Woodson2017-04-197-103/+81
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.32-1].Scott Dodson2017-04-212-2/+5
* | | | | | | | | Merge pull request #3966 from sdodson/dont-check-disabled-excludersScott Dodson2017-04-211-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't check excluder versions when they're not enabledScott Dodson2017-04-201-6/+7
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.31-1].Jenkins CD Merge Bot2017-04-212-2/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 05:01:56 +0000