summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3551 from sdodson/BZ1428532Scott Dodson2017-03-031-1/+8
|\
| * Only set ownership to etcd for thirdparty datadirScott Dodson2017-03-021-1/+8
* | Merge pull request #3548 from jcantrill/bz_1420256_again_reset_pvc_factsScott Dodson2017-03-022-18/+23
|\ \
| * | bug 1420256. Initialize openshift_logging pvc_facts to emptyJeff Cantrill2017-03-022-18/+23
* | | Merge pull request #3538 from mtnbikenc/bugfix-hosted-registryScott Dodson2017-03-021-1/+9
|\ \ \ | |_|/ |/| |
| * | Add oc_adm_policy_user task cluster-role policyRussell Teague2017-03-021-0/+7
| * | Correct config for hosted registryRussell Teague2017-03-021-1/+2
|/ /
* | Merge pull request #3547 from jupierce/oadm_policy_group_patchScott Dodson2017-03-024-4/+4
|\ \
| * | Fixing checkout for bindings with -binding suffixjupierce2017-03-024-4/+4
* | | Merge pull request #3449 from detiber/hacky_cert_parsingJason DeTiberus2017-03-029-352/+293
|\ \ \ | |/ / |/| |
| * | test fixes for openshift_certificates_expiryJason DeTiberus2017-03-029-352/+293
* | | Merge pull request #3546 from sdodson/contiv-role-removalScott Dodson2017-03-021-1/+1
|\ \ \
| * | | Leave an empty contiv role directoryScott Dodson2017-03-021-1/+1
| |/ /
* | | Merge pull request #3534 from jupierce/oadm_policy_groupScott Dodson2017-03-0210-0/+5030
|\ \ \ | |/ / |/| |
| * | oadm_policy_group/adm_policy_user modulejupierce2017-03-0210-0/+5030
|/ /
* | Merge pull request #3475 from ashcrow/1425583Tim Bielawa2017-03-021-0/+19
|\ \ | |/ |/|
| * Fail on Atomic if docker is too oldSteve Milner2017-03-021-0/+19
* | Merge pull request #3533 from kwoodson/registry_updatesAndrew Butcher2017-03-023-1/+7
|\ \
| * | Fixed error handling when oc adm ca create-server-cert fails. Fixed a logic ...Kenny Woodson2017-03-013-1/+7
* | | Merge pull request #3542 from sdodson/remove-contiv-from-rpmsScott Dodson2017-03-021-0/+4
|\ \ \
| * | | Remove contiv role and playbook from rpm packagesScott Dodson2017-03-021-0/+4
|/ / /
* | | Merge pull request #3393 from srampal/contivScott Dodson2017-03-0144-6/+984
|\ \ \
| * | | Combined (squashed) commit for all changes related to adding Contiv support i...Sanjeev Rampal2017-02-2744-6/+984
* | | | Merge pull request #3528 from abutcher/master-scaleupScott Dodson2017-03-012-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Add ca-bundle.crt to list of certs to synchronize.Andrew Butcher2017-02-281-1/+1
| * | | Do not force custom ca cert deployment.Andrew Butcher2017-02-281-0/+1
* | | | Merge pull request #3532 from sdodson/fis-templatesScott Dodson2017-03-0145-7/+14630
|\ \ \ \
| * | | | Add v1.3 FIS templatesScott Dodson2017-03-0116-2/+5066
| * | | | v1.4 Add FIS templatesScott Dodson2017-03-0114-0/+4777
| * | | | Add FIS templatesScott Dodson2017-03-0115-5/+4787
* | | | | Merge pull request #3493 from kwoodson/registry_reencyrpt_routeScott Dodson2017-03-0125-145/+278
|\ \ \ \ \
| * | | | | removing extra when conditionKenny Woodson2017-03-011-1/+0
| * | | | | Removing run_once.Kenny Woodson2017-03-011-4/+0
| * | | | | Adding the activeDeadlineSeconds. Removed debug.Kenny Woodson2017-03-012-11/+3
| * | | | | Separating routes so logic is simpler.Kenny Woodson2017-03-011-6/+30
| * | | | | Defaulting variables properly to avoid undefined route in dict error.Kenny Woodson2017-03-012-17/+16
| * | | | | Removed duplicate host param.Kenny Woodson2017-02-281-1/+0
| * | | | | Fixed failures on create when objects exist.Kenny Woodson2017-02-284-95/+163
| * | | | | Updating delete/recreate with replace --force.Kenny Woodson2017-02-283-18/+10
| * | | | | Fixed logic error. Ensure both svc and dc exist.Kenny Woodson2017-02-282-2/+2
| * | | | | Modified base debug statements. Fixed oc_secret debug/verbose flag. Added r...Kenny Woodson2017-02-2824-62/+80
| * | | | | Adding support for a route with certs and reencrypt.Kenny Woodson2017-02-284-3/+49
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3526 from richm/fluentd-filter-renamed-to-viaqJeff Cantrill2017-03-011-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | logging fluentd filter was renamed to viaqRich Megginson2017-02-281-1/+1
* | | | | Merge pull request #3502 from ingvagabund/when-installing-excluder-install-th...Jan Chaloupka2017-03-011-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | install the latest excludersJan Chaloupka2017-02-271-0/+2
* | | | | Merge pull request #3522 from mtnbikenc/pvc-type-fixRussell Teague2017-02-282-8/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add 'persistentVolumeClaim' to volume_info typeRussell Teague2017-02-282-8/+10
* | | | | Merge pull request #3434 from giuseppe/system-containers-moduleGiuseppe Scrivano2017-02-2810-164/+448
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | node: use the new oc_atomic_container moduleGiuseppe Scrivano2017-02-283-60/+18
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 23:47:44 +0000