| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3150 from jcantrill/bz_1415447_stop_heaster | Jason DeTiberus | 2017-01-24 | 1 | -5/+2 |
| |\ | |||||
| | * | fixes BZ-1415447. Error when stopping heapster. Modify to be conditional inc... | Jeff Cantrill | 2017-01-24 | 1 | -5/+2 |
| |/ | |||||
| * | Merge pull request #2981 from dgoodwin/upgrade-wait-for-node | Jason DeTiberus | 2017-01-24 | 1 | -0/+13 |
| |\ | |||||
| | * | Wait for nodes to be ready before proceeding with upgrade. | Devan Goodwin | 2016-12-15 | 1 | -0/+13 |
| * | | Merge pull request #3164 from mtnbikenc/firewalld_fix | Jason DeTiberus | 2017-01-24 | 1 | -2/+3 |
| |\ \ | |||||
| | * | | Remove is_containerized check for firewalld installs | Russell Teague | 2017-01-24 | 1 | -2/+3 |
| * | | | Merge pull request #3142 from bparees/forcepull_quotes | Scott Dodson | 2017-01-24 | 3 | -11/+2 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | treat force_pull as a bool | Ben Parees | 2017-01-23 | 3 | -11/+2 |
| * | | | Merge pull request #3166 from abutcher/pylint | Russell Teague | 2017-01-24 | 1 | -6/+23 |
| |\ \ \ | |||||
| | * | | | Clean up pylint for delete_empty_keys. | Andrew Butcher | 2017-01-24 | 1 | -6/+23 |
| * | | | | Merge pull request #3165 from abutcher/fix-default-iptables-args | Scott Dodson | 2017-01-24 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | [os_firewall] Fix default iptables args. | Andrew Butcher | 2017-01-24 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge pull request #3125 from ashcrow/serial-master-upgrade-doc | Jason DeTiberus | 2017-01-24 | 2 | -0/+76 |
| |\ \ \ | |||||
| | * | | | Added link to HOOKS in README | Steve Milner | 2017-01-23 | 1 | -0/+6 |
| | * | | | HOOKS.md added documenting new hooks | Steve Milner | 2017-01-23 | 1 | -0/+70 |
| * | | | | Merge pull request #3044 from mtnbikenc/docker-options | Jason DeTiberus | 2017-01-24 | 3 | -1/+6 |
| |\ \ \ \ | |||||
| | * | | | | Add new option 'openshift_docker_selinux_enabled' | Russell Teague | 2017-01-24 | 3 | -1/+6 |
| * | | | | | Merge pull request #3158 from bparees/skip_proxies | Jason DeTiberus | 2017-01-24 | 1 | -0/+12 |
| |\ \ \ \ \ | |||||
| | * | | | | | do not set empty proxy env variable defaults | Ben Parees | 2017-01-24 | 1 | -0/+12 |
| * | | | | | | Merge pull request #3145 from jcantrill/bz_1414477_missing_import_jks_deuce | Scott Dodson | 2017-01-24 | 3 | -137/+49 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | fix BZ1414477. Use keytool on control node and require java | Jeff Cantrill | 2017-01-23 | 3 | -137/+49 |
| * | | | | | | | Merge pull request #3101 from dgoodwin/pre-post-master-hook | Jason DeTiberus | 2017-01-24 | 3 | -0/+62 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| | * | | | | | | Add a mid upgrade hook, re-prefix variables. | Devan Goodwin | 2017-01-23 | 3 | -17/+33 |
| | * | | | | | | Debug message before running hooks. | Devan Goodwin | 2017-01-19 | 1 | -0/+6 |
| | * | | | | | | Run user provided hooks prior to system/service restarts. | Devan Goodwin | 2017-01-19 | 1 | -3/+4 |
| | * | | | | | | Implement pre/post master upgrade hooks. | Devan Goodwin | 2017-01-19 | 3 | -0/+39 |
| * | | | | | | | Merge pull request #3161 from tbielawa/maccabe_version_conflict | Jason DeTiberus | 2017-01-24 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Temporary work-around for flake8 vs maccabe version conflict | Tim Bielawa | 2017-01-24 | 1 | -0/+2 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #3152 from abutcher/iptables-w | Scott Dodson | 2017-01-24 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| | * | | | | | | [os_firewall] Add -w flag to wait for iptables xtables lock. | Andrew Butcher | 2017-01-23 | 1 | -1/+3 |
| * | | | | | | | Merge pull request #3155 from abutcher/bz1368579 | Scott Dodson | 2017-01-23 | 1 | -21/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Remove unused temporary directory in master config playbook. | Andrew Butcher | 2017-01-23 | 1 | -21/+0 |
| * | | | | | | | | Merge pull request #3135 from ewolinetz/fix_logging_jks_gen | Scott Dodson | 2017-01-23 | 6 | -78/+128 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into fix_logging_jks_gen | Eric Wolinetz | 2017-01-23 | 27 | -112/+1884 |
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #3151 from jcantrill/bz_1414625_require_httpd_tools | Scott Dodson | 2017-01-23 | 3 | -0/+23 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| | * | | | | | | | | fixes BZ-1414625. Check for httpd-tools and java before install | Jeff Cantrill | 2017-01-23 | 3 | -0/+23 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #3106 from andrewklau/haproxy-container | Scott Dodson | 2017-01-22 | 3 | -4/+40 |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| | * | | | | | | | Add containzerized haproxy option | Andrew Lau | 2017-01-21 | 3 | -4/+40 |
| * | | | | | | | | Merge pull request #3136 from jcantrill/logging_oc_apply | Jason DeTiberus | 2017-01-20 | 1 | -7/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | fix oc_apply to allow running on any control node | Jeff Cantrill | 2017-01-19 | 1 | -7/+14 |
| * | | | | | | | | | Merge pull request #3128 from jcantrill/3127_oc_apply_for_metrics | Jason DeTiberus | 2017-01-20 | 1 | -4/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | fixes #3127. Get files for oc_apply from remote host | Jeff Cantrill | 2017-01-19 | 1 | -4/+12 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #3143 from abutcher/reorder-dnsmasq-config | Jason DeTiberus | 2017-01-20 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| | * | | | | | | | | Reorder node dnsmasq dependency s.t. networkmanager is restarted after firewa... | Andrew Butcher | 2017-01-20 | 1 | -2/+2 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #3130 from kwoodson/lib_openshift_version | Kenny Woodson | 2017-01-20 | 15 | -63/+1789 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Adding version to lib_openshift | Kenny Woodson | 2017-01-20 | 15 | -63/+1789 |
| * | | | | | | | | | Merge pull request #3132 from richm/g_master_mktemp-conflict | Andrew Butcher | 2017-01-20 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| | * | | | | | | | | g_master_mktemp in openshift-master conflicts with openshift_master_certificates | Rich Megginson | 2017-01-19 | 1 | -4/+4 |
| | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #3138 from gabemontero/fixJenkins1-3 | Scott Dodson | 2017-01-20 | 2 | -28/+0 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| | * | | | | | | | jenkins v1.3 templates should not enable oauth | gabemontero | 2017-01-20 | 2 | -28/+0 |
| |/ / / / / / / | |||||
 |
index : csa/devops/ansible-patches/openshift.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |