summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3176 from sdodson/image-stream-syncScott Dodson2017-01-255-94/+134
|\
| * Sync latest image streamsScott Dodson2017-01-255-94/+134
* | Merge pull request #3172 from detiber/gceNodeNameScott Dodson2017-01-251-0/+2
|\ \
| * | override nodename for gce with cloudproviderJason DeTiberus2017-01-241-0/+2
* | | Merge pull request #3169 from jcantrill/logging_node_selectorScott Dodson2017-01-257-0/+27
|\ \ \
| * | | allow openshift_logging role to specify nodeSelectorsJeff Cantrill2017-01-247-0/+27
| |/ /
* | | Merge pull request #3173 from lhuard1A/ose_3.4Scott Dodson2017-01-251-2/+2
|\ \ \
| * | | Allow RHEL subscription for OSE 3.4Lénaïc Huard2017-01-251-2/+2
* | | | Merge pull request #3147 from andrewklau/haproxy-containerScott Dodson2017-01-253-4/+8
|\ \ \ \
| * | | | Fix containerized haproxy configAndrew Lau2017-01-253-4/+8
* | | | | Merge pull request #3171 from ewolinetz/logging_local_file_creationJason DeTiberus2017-01-243-68/+34
|\ \ \ \ \
| * | | | | fixes jks generation, node labeling, and rerunning for oauth secretsewolinetz2017-01-243-68/+34
* | | | | | Merge pull request #3150 from jcantrill/bz_1415447_stop_heasterJason DeTiberus2017-01-241-5/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fixes BZ-1415447. Error when stopping heapster. Modify to be conditional inc...Jeff Cantrill2017-01-241-5/+2
|/ / / / /
* | | | | Merge pull request #2981 from dgoodwin/upgrade-wait-for-nodeJason DeTiberus2017-01-241-0/+13
|\ \ \ \ \
| * | | | | Wait for nodes to be ready before proceeding with upgrade.Devan Goodwin2016-12-151-0/+13
* | | | | | Merge pull request #3164 from mtnbikenc/firewalld_fixJason DeTiberus2017-01-241-2/+3
|\ \ \ \ \ \
| * | | | | | Remove is_containerized check for firewalld installsRussell Teague2017-01-241-2/+3
* | | | | | | Merge pull request #3142 from bparees/forcepull_quotesScott Dodson2017-01-243-11/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | treat force_pull as a boolBen Parees2017-01-233-11/+2
* | | | | | | Merge pull request #3166 from abutcher/pylintRussell Teague2017-01-241-6/+23
|\ \ \ \ \ \ \
| * | | | | | | Clean up pylint for delete_empty_keys.Andrew Butcher2017-01-241-6/+23
* | | | | | | | Merge pull request #3165 from abutcher/fix-default-iptables-argsScott Dodson2017-01-241-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [os_firewall] Fix default iptables args.Andrew Butcher2017-01-241-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #3125 from ashcrow/serial-master-upgrade-docJason DeTiberus2017-01-242-0/+76
|\ \ \ \ \ \ \
| * | | | | | | Added link to HOOKS in READMESteve Milner2017-01-231-0/+6
| * | | | | | | HOOKS.md added documenting new hooksSteve Milner2017-01-231-0/+70
* | | | | | | | Merge pull request #3044 from mtnbikenc/docker-optionsJason DeTiberus2017-01-243-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add new option 'openshift_docker_selinux_enabled'Russell Teague2017-01-243-1/+6
* | | | | | | | | Merge pull request #3158 from bparees/skip_proxiesJason DeTiberus2017-01-241-0/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | do not set empty proxy env variable defaultsBen Parees2017-01-241-0/+12
* | | | | | | | | Merge pull request #3145 from jcantrill/bz_1414477_missing_import_jks_deuceScott Dodson2017-01-243-137/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix BZ1414477. Use keytool on control node and require javaJeff Cantrill2017-01-233-137/+49
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #3101 from dgoodwin/pre-post-master-hookJason DeTiberus2017-01-243-0/+62
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add a mid upgrade hook, re-prefix variables.Devan Goodwin2017-01-233-17/+33
| * | | | | | | | Debug message before running hooks.Devan Goodwin2017-01-191-0/+6
| * | | | | | | | Run user provided hooks prior to system/service restarts.Devan Goodwin2017-01-191-3/+4
| * | | | | | | | Implement pre/post master upgrade hooks.Devan Goodwin2017-01-193-0/+39
* | | | | | | | | Merge pull request #3161 from tbielawa/maccabe_version_conflictJason DeTiberus2017-01-241-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Temporary work-around for flake8 vs maccabe version conflictTim Bielawa2017-01-241-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #3152 from abutcher/iptables-wScott Dodson2017-01-241-1/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | [os_firewall] Add -w flag to wait for iptables xtables lock.Andrew Butcher2017-01-231-1/+3
* | | | | | | | Merge pull request #3155 from abutcher/bz1368579Scott Dodson2017-01-231-21/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused temporary directory in master config playbook.Andrew Butcher2017-01-231-21/+0
* | | | | | | | | Merge pull request #3135 from ewolinetz/fix_logging_jks_genScott Dodson2017-01-236-78/+128
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into fix_logging_jks_genEric Wolinetz2017-01-2327-112/+1884
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3151 from jcantrill/bz_1414625_require_httpd_toolsScott Dodson2017-01-233-0/+23
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fixes BZ-1414625. Check for httpd-tools and java before installJeff Cantrill2017-01-233-0/+23
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3106 from andrewklau/haproxy-containerScott Dodson2017-01-223-4/+40
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Add containzerized haproxy optionAndrew Lau2017-01-213-4/+40
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 07:23:58 +0000