summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3654 from kwoodson/project_fixOpenShift Bot2017-03-173-44/+222
|\ | | | | Merged by openshift-bot
| * Do not update when properties when not passed.Kenny Woodson2017-03-163-44/+222
| |
* | Automatic commit of package [openshift-ansible] release [3.6.3-1].Jenkins CD Merge Bot2017-03-172-2/+5
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | Merge pull request #3694 from ↵Scott Dodson2017-03-175-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 installedJan Chaloupka2017-03-165-16/+23
| | |
* | | Automatic commit of package [openshift-ansible] release [3.6.2-1].Jenkins CD Merge Bot2017-03-162-2/+8
|/ / | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | Merge pull request #3671 from abutcher/router-nodesOpenShift Bot2017-03-161-3/+10
|\ \ | | | | | | Merged by openshift-bot
| * | Fix get_router_replicas infrastructure node count.Andrew Butcher2017-03-161-3/+10
| | |
* | | Merge pull request #3681 from ↵Scott Dodson2017-03-162-0/+22
|\ \ \ | |_|/ |/| | | | | | | | ingvagabund/enable-excluders-during-scale-up-as-well enable excluders during node/master scaling up
| * | enable excluders during node/master scaling upJan Chaloupka2017-03-162-0/+22
| | |
* | | Merge pull request #3683 from kwoodson/py35_scope_fixScott Dodson2017-03-1621-63/+63
|\ \ \ | | | | | | | | Fixing variable naming for 35 scoping.
| * | | Fixing variable naming for 35 scoping.Kenny Woodson2017-03-1621-63/+63
| | | |
* | | | Merge pull request #3674 from sdodson/fix-ovs-raceOpenShift Bot2017-03-161-0/+2
|\ \ \ \ | |_|/ / |/| | | Merged by openshift-bot
| * | | Fix containerized openvswitch raceScott Dodson2017-03-151-0/+2
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.6.1-1].Jenkins CD Merge Bot2017-03-162-2/+527
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | Merge pull request #3688 from smunilla/masterScott Dodson2017-03-161-1/+1
|\ \ \ \ | | | | | | | | | | Bump version to 3.6.0
| * | | | Bump version to 3.6.0Samuel Munilla2017-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | Bump up the version to make our daily builds happy.
* | | | | Merge pull request #3675 from sdodson/only_use_excluders_on_masters_nodesScott Dodson2017-03-163-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Only call excluder playbooks on masters and nodes
| * | | | | Only call excluder playbooks on masters and nodesScott Dodson2017-03-153-3/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #3669 from ewolinetz/logging_master_api_portScott Dodson2017-03-161-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Removing dependency on master facts for master_public_url default
| * | | | Removing dependency on master facts for master_public_url defaultewolinetz2017-03-151-1/+1
| | | | |
* | | | | Merge pull request #3664 from ewolinetz/logging_cherrypick_3657OpenShift Bot2017-03-167-17/+20
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * \ \ \ \ Merge branch 'master' into logging_cherrypick_3657Eric Wolinetz2017-03-159-16/+38
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Cherry picked from #3657ewolinetz2017-03-157-16/+21
| | | | | |
* | | | | | Merge pull request #3682 from rhcarvalho/doc-run-single-testScott Dodson2017-03-161-10/+60
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Improve CONTRIBUTING guide with testing tricks
| * | | | | Improve CONTRIBUTING guide with testing tricksRodolfo Carvalho2017-03-161-10/+60
| | | | | |
* | | | | | Merge pull request #3673 from sdodson/remove-excluder-statusOpenShift Bot2017-03-163-90/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Since we've decided that we're no longer paying attention to currentScott Dodson2017-03-153-90/+0
| | |_|/ / / | |/| | | | | | | | | | | | | | | | status remove this as it was toggling things
* | | | | | Merge pull request #3678 from sdodson/update-versionsScott Dodson2017-03-162-6/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Update versions in example inventories
| * | | | | Update versions in example inventoriesScott Dodson2017-03-162-6/+6
|/ / / / /
* | | | | Merge pull request #3670 from detiber/killNotificationsJason DeTiberus2017-03-151-18/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove travis notifications
| * | | | | Remove travis notificationsJason DeTiberus2017-03-151-18/+0
| |/ / / /
* | | | | Merge pull request #3626 from mtnbikenc/module_renameOpenShift Bot2017-03-1511-31/+31
|\ \ \ \ \ | |_|_|_|/ |/| | | | Merged by openshift-bot
| * | | | Renaming oadm_manage_node to oc_adm_manage_nodeRussell Teague2017-03-1011-31/+31
| | | | |
* | | | | Merge pull request #3666 from ↵OpenShift Bot2017-03-151-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.dJan Chaloupka2017-03-151-2/+6
| | |/ / | |/| |
* | | | Merge pull request #3629 from ewolinetz/logging_15_cherrypickOpenShift Bot2017-03-158-10/+11
|\ \ \ \ | |_|_|/ |/| | | Merged by openshift-bot
| * | | cherry picking from #3621 #3614 #3627ewolinetz2017-03-108-10/+11
| | | |
* | | | Merge pull request #3646 from vishpat/service-accountOpenShift Bot2017-03-152-0/+23
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Nuage service account handling by single masterVishal Patil2017-03-142-0/+23
| | | | |
* | | | | Merge pull request #3634 from kwoodson/raise_on_prep_failuresOpenShift Bot2017-03-152-8/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | Merged by openshift-bot
| * | | | Raise on dry-run failures.Kenny Woodson2017-03-132-8/+8
| | | | |
* | | | | Merge pull request #3650 from mtnbikenc/fix-routerOpenShift Bot2017-03-151-0/+9
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Add router svcacct cluster-reader roleRussell Teague2017-03-141-0/+9
| | | | | |
* | | | | | Merge pull request #3658 from ↵Scott Dodson2017-03-145-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 Kuznetsov2017-03-145-23/+16
|/ / / / / /
* | | | | | Merge pull request #3599 from martineg/min_tls_versionOpenShift Bot2017-03-144-0/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Allow overriding minTLSVersion and cipherSuitesMartin Eggen2017-03-094-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add parameters to allow overriding minTLSVersion and cipherSuites in master and node servingInfo config stanzas.
* | | | | | | Merge pull request #3620 from ↵Scott Dodson2017-03-145-16/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/enable-docker-during-installation-and-upgrade-by-default Enable docker during installation and upgrade by default
| * | | | | | | enable docker excluder since the time it is installedJan Chaloupka2017-03-135-16/+23
| | |_|/ / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 15:07:57 +0000