summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3618 from germansosa/masterScott Dodson2017-03-102-2/+2
|\
| * Fix references to openshift_set_node_ip in inventory examplesgermansosa2017-03-102-2/+2
* | Merge pull request #3613 from detiber/module_utils_sixOpenShift Bot2017-03-106-31/+33
|\ \ | |/ |/|
| * Use ansible.compat.six where possibleJason DeTiberus2017-03-094-26/+30
| * Use six from ansible.module_utils for remote hostsJason DeTiberus2017-03-095-8/+6
* | Merge pull request #3600 from tbielawa/etcd_is_atomic-BZ1427067OpenShift Bot2017-03-094-2/+20
|\ \
| * | Remove debug taskTim Bielawa2017-03-091-3/+0
| * | New roleTim Bielawa2017-03-084-2/+23
* | | Merge pull request #3605 from kwoodson/oc_adm_policy_user_fixOpenShift Bot2017-03-096-54/+5319
|\ \ \ | |_|/ |/| |
| * | Fixing the way policies are found. The old method was unreliable. This meth...Kenny Woodson2017-03-086-54/+5319
| |/
* | Merge pull request #3590 from kwoodson/router_registry_unit_testsAndrew Butcher2017-03-0926-51/+915
|\ \
| * | Lowering test coverage percentage.Kenny Woodson2017-03-081-1/+1
| * | Removing ordereddict. Replaced with sorted keys.Kenny Woodson2017-03-0826-95/+97
| * | Fixed for linting.Kenny Woodson2017-03-082-5/+1
| * | Fix to OpenshiftCLIConfig to support an ordereddict. This was breaking test ...Kenny Woodson2017-03-0726-115/+420
| * | Adding test_oc_adm_router.Kenny Woodson2017-03-071-0/+476
| * | Adding router test.Kenny Woodson2017-03-071-0/+85
* | | Merge pull request #3586 from srampal/issue3541Scott Dodson2017-03-094-1/+36
|\ \ \
| * | | Fix for issue 3541Sanjeev Rampal2017-03-074-1/+36
* | | | Merge pull request #3607 from ingvagabund/extend-excluders-to-containerized-ocpJan Chaloupka2017-03-096-6/+6
|\ \ \ \
| * | | | extend the excluders to containerized deploymentJan Chaloupka2017-03-096-6/+6
|/ / / /
* | | | Merge pull request #3604 from sdodson/issue3603Scott Dodson2017-03-081-0/+1
|\ \ \ \
| * | | | openshift_excluders depends on openshift_reposScott Dodson2017-03-081-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #3601 from mmckinst/etcd_versionOpenShift Bot2017-03-085-3/+7
|\ \ \ \ | |/ / / |/| | |
| * | | add ability to specify an etcd versionMark McKinstry2017-03-085-3/+7
* | | | Merge pull request #3589 from brenton/masterScott Dodson2017-03-082-0/+142
|\ \ \ \
| * | | | Adding scripts for building and pushing imagesBrenton Leanhardt2017-03-072-0/+142
* | | | | Merge pull request #3597 from ingvagabund/enable-excluders-by-defaultScott Dodson2017-03-082-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | enable excluders by defaultJan Chaloupka2017-03-082-2/+4
|/ / / /
* | | | Merge pull request #3595 from ingvagabund/check-docker-excluder-status-only-w...Jan Chaloupka2017-03-081-0/+1
|\ \ \ \
| * | | | ignore the docker excluder status if it is not enabled by a userJan Chaloupka2017-03-081-0/+1
|/ / / /
* | | | Merge pull request #3585 from tbielawa/petset_early_failScott Dodson2017-03-073-3/+53
|\ \ \ \
| * | | | Fix pylint/pyflakes errors on masterScott Dodson2017-03-072-3/+4
| * | | | Identify PetSets in 3.4 clusters and fail if any are detectedTim Bielawa2017-03-071-0/+49
|/ / / /
* | | | Merge pull request #3558 from ewolinetz/logging_metrics_defaultsScott Dodson2017-03-0710-24/+52
|\ \ \ \
| * | | | More logging fixesewolinetz2017-03-074-8/+4
| * | | | Fixing plugin, nodeselectors, and secret pull checkewolinetz2017-03-075-6/+15
| * | | | Updating metrics defaultsewolinetz2017-03-062-6/+9
| * | | | Adding some more logging defaultsewolinetz2017-03-035-11/+31
* | | | | Merge pull request #3529 from ingvagabund/upgrade-excluders-in-upgrade-onlyJan Chaloupka2017-03-0726-96/+284
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | - update excluders to latest, in non-upgrade scenarios do not updateJan Chaloupka2017-03-0726-96/+284
* | | | | Merge pull request #3588 from mtnbikenc/docker-fixScott Dodson2017-03-071-1/+1
|\ \ \ \ \
| * | | | | Loosely couple docker to iptables serviceRussell Teague2017-03-071-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #3574 from sdodson/35_sdnvalidatorScott Dodson2017-03-076-3/+47
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Generic message directing people to contact supportScott Dodson2017-03-073-3/+21
| * | | | Add oc_objectvalidator to upgrade checkScott Dodson2017-03-073-0/+26
* | | | | Merge pull request #3565 from EricMountain-1A/fix_upstream_docker_registries_...Andrew Butcher2017-03-071-2/+7
|\ \ \ \ \
| * | | | | Preserve order of Docker registriesEric Mountain2017-03-071-2/+7
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3582 from kwoodson/router_sharding_docScott Dodson2017-03-072-1/+89
|\ \ \ \ \
| * | | | | Adding into the origin inventory doc.Kenny Woodson2017-03-071-1/+45