summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-01-24Merge pull request #3150 from jcantrill/bz_1415447_stop_heasterJason DeTiberus
2017-01-24fixes BZ-1415447. Error when stopping heapster. Modify to be conditional inc...Jeff Cantrill
2017-01-24Merge pull request #2981 from dgoodwin/upgrade-wait-for-nodeJason DeTiberus
2017-01-24Merge pull request #3164 from mtnbikenc/firewalld_fixJason DeTiberus
2017-01-24Merge pull request #3142 from bparees/forcepull_quotesScott Dodson
2017-01-24Remove is_containerized check for firewalld installsRussell Teague
2017-01-24Merge pull request #3166 from abutcher/pylintRussell Teague
2017-01-24Clean up pylint for delete_empty_keys.Andrew Butcher
2017-01-24Merge pull request #3165 from abutcher/fix-default-iptables-argsScott Dodson
2017-01-24[os_firewall] Fix default iptables args.Andrew Butcher
2017-01-24Merge pull request #3125 from ashcrow/serial-master-upgrade-docJason DeTiberus
2017-01-24Merge pull request #3044 from mtnbikenc/docker-optionsJason DeTiberus
2017-01-24Merge pull request #3158 from bparees/skip_proxiesJason DeTiberus
2017-01-24Merge pull request #3145 from jcantrill/bz_1414477_missing_import_jks_deuceScott Dodson
2017-01-24Merge pull request #3101 from dgoodwin/pre-post-master-hookJason DeTiberus
2017-01-24Add new option 'openshift_docker_selinux_enabled'Russell Teague
2017-01-24Merge pull request #3161 from tbielawa/maccabe_version_conflictJason DeTiberus
2017-01-24Temporary work-around for flake8 vs maccabe version conflictTim Bielawa
2017-01-24Merge pull request #3152 from abutcher/iptables-wScott Dodson
2017-01-24do not set empty proxy env variable defaultsBen Parees
2017-01-23fix BZ1414477. Use keytool on control node and require javaJeff Cantrill
2017-01-23Merge pull request #3155 from abutcher/bz1368579Scott Dodson
2017-01-23Merge pull request #3135 from ewolinetz/fix_logging_jks_genScott Dodson
2017-01-23Merge branch 'master' into fix_logging_jks_genEric Wolinetz
2017-01-23Merge pull request #3151 from jcantrill/bz_1414625_require_httpd_toolsScott Dodson
2017-01-23Remove unused temporary directory in master config playbook.Andrew Butcher
2017-01-23Added link to HOOKS in READMESteve Milner
2017-01-23HOOKS.md added documenting new hooksSteve Milner
2017-01-23[os_firewall] Add -w flag to wait for iptables xtables lock.Andrew Butcher
2017-01-23fixes BZ-1414625. Check for httpd-tools and java before installJeff Cantrill
2017-01-23Add a mid upgrade hook, re-prefix variables.Devan Goodwin
2017-01-23treat force_pull as a boolBen Parees
2017-01-22Merge pull request #3106 from andrewklau/haproxy-containerScott Dodson
2017-01-20Adding to ansible spec and changing logging jks generation to be a local_actionewolinetz
2017-01-20Merge pull request #3136 from jcantrill/logging_oc_applyJason DeTiberus
2017-01-20Merge pull request #3128 from jcantrill/3127_oc_apply_for_metricsJason DeTiberus
2017-01-21Add containzerized haproxy optionAndrew Lau
2017-01-20Merge pull request #3143 from abutcher/reorder-dnsmasq-configJason DeTiberus
2017-01-20Reorder node dnsmasq dependency s.t. networkmanager is restarted after firewa...Andrew Butcher
2017-01-20Removing docker run strategy and make java a requirement for control hostewolinetz
2017-01-20Merge pull request #3130 from kwoodson/lib_openshift_versionKenny Woodson
2017-01-20Adding version to lib_openshiftKenny Woodson
2017-01-20Merge pull request #3132 from richm/g_master_mktemp-conflictAndrew Butcher
2017-01-20Merge pull request #3138 from gabemontero/fixJenkins1-3Scott Dodson
2017-01-20Updating to use docker run instead of scheduling jks gen podewolinetz
2017-01-20jenkins v1.3 templates should not enable oauthgabemontero
2017-01-19fix oc_apply to allow running on any control nodeJeff Cantrill
2017-01-19g_master_mktemp in openshift-master conflicts with openshift_master_certificatesRich Megginson
2017-01-19Merge pull request #3123 from jcantrill/bz_141619Jason DeTiberus
2017-01-19Merge pull request #3126 from mtnbikenc/fix-upgrade-repocacheJason DeTiberus