summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* separate out test tool configs from setup.cfgJason DeTiberus2017-03-064-28/+23
* Merge pull request #3563 from rhcarvalho/misc-cleanupRodolfo Carvalho2017-03-069-140/+48
|\
| * Remove old commented-out testsRodolfo Carvalho2017-03-061-91/+0
| * Remove redundant assertionRodolfo Carvalho2017-03-061-2/+0
| * Fix testRodolfo Carvalho2017-03-061-7/+1
| * Lint utils/testRodolfo Carvalho2017-03-064-26/+24
| * Rewrap long linesRodolfo Carvalho2017-03-062-8/+22
| * Remove unused argumentRodolfo Carvalho2017-03-061-1/+1
| * Remove unused Makefile variablesRodolfo Carvalho2017-03-061-5/+0
|/
* Merge pull request #3556 from dcbw/sdn-preserve-var-lib-cniScott Dodson2017-03-032-2/+2
|\
| * node/sdn: make /var/lib/cni persistent to ensure IPAM allocations stick aroun...Dan Williams2017-03-032-2/+2
* | Merge pull request #3499 from sdodson/1422348Scott Dodson2017-03-037-29/+20
|\ \ | |/ |/|
| * BZ1422348 - Don't install python-ruamel-yamlScott Dodson2017-03-035-25/+2
| * Re-generate modulesScott Dodson2017-03-032-4/+18
|/
* Merge pull request #3527 from joelddiaz/yedit-path-exceptionsKenny Woodson2017-03-0320-39/+191
|\
| * regenerate lib_openshift with yedit exception changesJoel Diaz2017-02-2817-34/+153
| * raise exceptions when walking through object pathJoel Diaz2017-02-283-5/+38
* | Merge pull request #3550 from ewolinetz/logging_update_metaScott Dodson2017-03-031-1/+0
|\ \
| * | Removing the openshift_master_facts dependencyewolinetz2017-03-021-1/+0
* | | 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
|\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 18:16:37 +0000