| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Cherry picking from #3711 | ewolinetz | 2017-03-20 | 2 | -10/+59 |
| | | |||||
| * | Merge pull request #3477 from lmello/fix-generate_jks.sh | OpenShift Bot | 2017-03-17 | 1 | -1/+1 |
| |\ | | | | | Merged by openshift-bot | ||||
| | * | change shell to bash in generate_jks.sh | Leonardo Rodrigues de Mello | 2017-02-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generate_jks.sh script uses non-posix standard shell features, this breaks the openshift_logging installation if the controller node is running debian or ubuntu. This problem was not spot before because probably all the developers use fedora or redhat/centos and in redhat based distributions the /bin/sh is a symlink to bash. Debian and ubuntu adopted dash a long time ago and in debian/ubuntu controller nodes /bin/sh is a symlink to dash, that does not support the extended feature set required by this script. This commit changes the shell to bash to ensure it is run with a shell interpreter that supports the extended feature. https://www.shellcheck.net/ https://wiki.ubuntu.com/DashAsBinSh | ||||
| * | | Merge pull request #3654 from kwoodson/project_fix | OpenShift Bot | 2017-03-17 | 3 | -44/+222 |
| |\ \ | | | | | | | Merged by openshift-bot | ||||
| | * | | Do not update when properties when not passed. | Kenny Woodson | 2017-03-16 | 3 | -44/+222 |
| | | | | |||||
| * | | | Automatic commit of package [openshift-ansible] release [3.6.3-1]. | Jenkins CD Merge Bot | 2017-03-17 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
| * | | | Merge pull request #3694 from ↵ | Scott Dodson | 2017-03-17 | 5 | -16/+23 |
| |\ \ \ | | | | | | | | | | | | | | | | | ingvagabund/enable-docker-during-installation-and-upgrade-by-default-revert-revert enable docker excluder since the time it is installed | ||||
| | * | | | enable docker excluder since the time it is installed | Jan Chaloupka | 2017-03-16 | 5 | -16/+23 |
| | | | | | |||||
| * | | | | Automatic commit of package [openshift-ansible] release [3.6.2-1]. | Jenkins CD Merge Bot | 2017-03-16 | 2 | -2/+8 |
| |/ / / | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
| * | | | Merge pull request #3671 from abutcher/router-nodes | OpenShift Bot | 2017-03-16 | 1 | -3/+10 |
| |\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | Fix get_router_replicas infrastructure node count. | Andrew Butcher | 2017-03-16 | 1 | -3/+10 |
| | | | | | |||||
| * | | | | Merge pull request #3681 from ↵ | Scott Dodson | 2017-03-16 | 2 | -0/+22 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | ingvagabund/enable-excluders-during-scale-up-as-well enable excluders during node/master scaling up | ||||
| | * | | | enable excluders during node/master scaling up | Jan Chaloupka | 2017-03-16 | 2 | -0/+22 |
| | | | | | |||||
| * | | | | Merge pull request #3683 from kwoodson/py35_scope_fix | Scott Dodson | 2017-03-16 | 21 | -63/+63 |
| |\ \ \ \ | | | | | | | | | | | Fixing variable naming for 35 scoping. | ||||
| | * | | | | Fixing variable naming for 35 scoping. | Kenny Woodson | 2017-03-16 | 21 | -63/+63 |
| | | | | | | |||||
| * | | | | | Merge pull request #3674 from sdodson/fix-ovs-race | OpenShift Bot | 2017-03-16 | 1 | -0/+2 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Merged by openshift-bot | ||||
| | * | | | | Fix containerized openvswitch race | Scott Dodson | 2017-03-15 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Automatic commit of package [openshift-ansible] release [3.6.1-1]. | Jenkins CD Merge Bot | 2017-03-16 | 2 | -2/+527 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
| * | | | | | Merge pull request #3688 from smunilla/master | Scott Dodson | 2017-03-16 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Bump version to 3.6.0 | ||||
| | * | | | | | Bump version to 3.6.0 | Samuel Munilla | 2017-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Bump up the version to make our daily builds happy. | ||||
| * | | | | | | Merge pull request #3675 from sdodson/only_use_excluders_on_masters_nodes | Scott Dodson | 2017-03-16 | 3 | -3/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Only call excluder playbooks on masters and nodes | ||||
| | * | | | | | | Only call excluder playbooks on masters and nodes | Scott Dodson | 2017-03-15 | 3 | -3/+3 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge pull request #3669 from ewolinetz/logging_master_api_port | Scott Dodson | 2017-03-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Removing dependency on master facts for master_public_url default | ||||
| | * | | | | | Removing dependency on master facts for master_public_url default | ewolinetz | 2017-03-15 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3664 from ewolinetz/logging_cherrypick_3657 | OpenShift Bot | 2017-03-16 | 7 | -17/+20 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * \ \ \ \ \ | Merge branch 'master' into logging_cherrypick_3657 | Eric Wolinetz | 2017-03-15 | 9 | -16/+38 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | | Cherry picked from #3657 | ewolinetz | 2017-03-15 | 7 | -16/+21 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3682 from rhcarvalho/doc-run-single-test | Scott Dodson | 2017-03-16 | 1 | -10/+60 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Improve CONTRIBUTING guide with testing tricks | ||||
| | * | | | | | | Improve CONTRIBUTING guide with testing tricks | Rodolfo Carvalho | 2017-03-16 | 1 | -10/+60 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3673 from sdodson/remove-excluder-status | OpenShift Bot | 2017-03-16 | 3 | -90/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | | | Since we've decided that we're no longer paying attention to current | Scott Dodson | 2017-03-15 | 3 | -90/+0 |
| | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | status remove this as it was toggling things | ||||
| * | | | | | | | Merge pull request #3678 from sdodson/update-versions | Scott Dodson | 2017-03-16 | 2 | -6/+6 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Update versions in example inventories | ||||
| | * | | | | | | Update versions in example inventories | Scott Dodson | 2017-03-16 | 2 | -6/+6 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #3670 from detiber/killNotifications | Jason DeTiberus | 2017-03-15 | 1 | -18/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove travis notifications | ||||
| | * | | | | | | Remove travis notifications | Jason DeTiberus | 2017-03-15 | 1 | -18/+0 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #3626 from mtnbikenc/module_rename | OpenShift Bot | 2017-03-15 | 11 | -31/+31 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Merged by openshift-bot | ||||
| | * | | | | | Renaming oadm_manage_node to oc_adm_manage_node | Russell Teague | 2017-03-10 | 11 | -31/+31 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3666 from ↵ | OpenShift Bot | 2017-03-15 | 1 | -2/+6 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | ingvagabund/dont-asume-openshift_upgrade_target-is-not-trivial Merged by openshift-bot | ||||
| | * | | | | | don't assume openshift_upgrade_target is in a form d.d | Jan Chaloupka | 2017-03-15 | 1 | -2/+6 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #3629 from ewolinetz/logging_15_cherrypick | OpenShift Bot | 2017-03-15 | 8 | -10/+11 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Merged by openshift-bot | ||||
| | * | | | | cherry picking from #3621 #3614 #3627 | ewolinetz | 2017-03-10 | 8 | -10/+11 |
| | | | | | | |||||
| * | | | | | Merge pull request #3646 from vishpat/service-account | OpenShift Bot | 2017-03-15 | 2 | -0/+23 |
| |\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | Nuage service account handling by single master | Vishal Patil | 2017-03-14 | 2 | -0/+23 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3634 from kwoodson/raise_on_prep_failures | OpenShift Bot | 2017-03-15 | 2 | -8/+8 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Merged by openshift-bot | ||||
| | * | | | | | Raise on dry-run failures. | Kenny Woodson | 2017-03-13 | 2 | -8/+8 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3650 from mtnbikenc/fix-router | OpenShift Bot | 2017-03-15 | 1 | -0/+9 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | | Add router svcacct cluster-reader role | Russell Teague | 2017-03-14 | 1 | -0/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3658 from ↵ | Scott Dodson | 2017-03-14 | 5 | -23/+16 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift/revert-3620-enable-docker-during-installation-and-upgrade-by-default Revert "Enable docker during installation and upgrade by default" | ||||
| | * | | | | | | | Revert "Enable docker during installation and upgrade by default" | Steve Kuznetsov | 2017-03-14 | 5 | -23/+16 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #3599 from martineg/min_tls_version | OpenShift Bot | 2017-03-14 | 4 | -0/+45 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
 |
index : csa/devops/ansible-patches/openshift.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |