summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #4073 from richm/logging-es-routeScott Dodson2017-05-195-0/+205
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add ability to expose Elasticsearch as an external routeRich Megginson2017-05-185-0/+205
* | | | | | | | | | Merge pull request #4094 from ashcrow/status-doesnt-existJan Chaloupka2017-05-192-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ensure good return code for specific until loopsSteve Milner2017-05-042-2/+2
* | | | | | | | | | | Merge pull request #4128 from VincentS/Container_Registry_FirewalldJan Chaloupka2017-05-192-0/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added Docker Registry Port 5000 to FirewalldVincent Schwarzer2017-05-182-0/+10
* | | | | | | | | | | | Merge pull request #4145 from VincentS/Calico_ParameterizationJan Chaloupka2017-05-194-3/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Parameterized Calico/Node ArgumentsVincent Schwarzer2017-05-184-3/+32
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #4125 from VincentS/Calico_BGP_PortJan Chaloupka2017-05-192-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added Calico BGP Port 179 to FirewalldVincent Schwarzer2017-05-152-0/+9
* | | | | | | | | | | | | Merge pull request #4224 from VincentS/LocalTMPDir_FixOpenShift Bot2017-05-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Localhost TMP Dir FixVincent Schwarzer2017-05-181-0/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4218 from abutcher/uninstall-container-engine-dockerOpenShift Bot2017-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Uninstall: restart docker when container-engine restart hasn't changed.Andrew Butcher2017-05-171-1/+1
* | | | | | | | | | | | | | Merge pull request #3660 from juanvallejo/jvallejo/add-etcd-clustersize-checkOpenShift Bot2017-05-183-0/+534
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | add etcd cluster size checkjuanvallejo2017-05-173-0/+534
* | | | | | | | | | | | | | Merge pull request #4208 from abutcher/local-action-delegateOpenShift Bot2017-05-184-12/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove use of local_action with delegate_to and switch 'delegate_to: localhos...Andrew Butcher2017-05-164-12/+6
* | | | | | | | | | | | | | | Merge pull request #4183 from jpeeler/masterOpenShift Bot2017-05-183-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix python3 error in repoqueryJeff Peeler2017-05-133-3/+3
* | | | | | | | | | | | | | | | Merge pull request #3914 from rikkuness/yaml_newlineOpenShift Bot2017-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Prevent line wrap in yaml dump of IDP, fixes #3912Darrian2017-04-121-0/+1
* | | | | | | | | | | | | | | | | Merge pull request #4165 from sdodson/BZ1450167OpenShift Bot2017-05-181-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Reset selinux context on /var/lib/origin/openshift.common.volumesScott Dodson2017-05-111-0/+6
* | | | | | | | | | | | | | | | | | Merge pull request #4190 from sdodson/BZ1428934OpenShift Bot2017-05-181-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Include object validation in 3.6 upgradesScott Dodson2017-05-151-1/+3
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #4142 from VincentS/Adjustment_Naming_SchemaOpenShift Bot2017-05-184-19/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Adjusted Naming Schema of Calico RolesVincent Schwarzer2017-05-184-19/+19
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #4205 from stevekuznetsov/skuznets/logging-tmpdirScott Dodson2017-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Don't escalate privileges in local tmpdir creationSteve Kuznetsov2017-05-161-0/+1
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #4176 from mtnbikenc/refactor-openshift_excludersOpenShift Bot2017-05-1819-253/+254
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Rework openshift_excluders roleRussell Teague2017-05-1619-253/+254
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #4143 from VincentS/calicoctl_roleJan Chaloupka2017-05-182-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Added Calicoctl to deployment of Master NodesVincent Schwarzer2017-05-182-0/+11
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #4213 from giuseppe/change-requires-to-wants-openvswitchOpenShift Bot2017-05-182-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | node, systemd: change Requires to Wants for openvswitchGiuseppe Scrivano2017-05-172-2/+2
* | | | | | | | | | | | | | | | Merge pull request #4216 from ingvagabund/fix-etcd-upgrade-system-containerOpenShift Bot2017-05-171-39/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fix etcd_container_version detectionJan Chaloupka2017-05-171-39/+57
* | | | | | | | | | | | | | | | | Merge pull request #4214 from giuseppe/rename-ENIRONMENT-to-EnvironmentOpenShift Bot2017-05-171-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENTGiuseppe Scrivano2017-05-171-3/+3
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #4127 from VincentS/Calico_Additional_ChecksOpenShift Bot2017-05-171-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Change based on feedbackVincent Schwarzer2017-05-101-1/+1
| * | | | | | | | | | | | | | | | | Added additional Calico Network Plugin ChecksVincent Schwarzer2017-05-091-1/+9
* | | | | | | | | | | | | | | | | | Merge pull request #4221 from sdodson/fix-gpg-key-pathScott Dodson2017-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix gpg key path in our repoScott Dodson2017-05-171-1/+1
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #4199 from smarterclayton/set_image_policyOpenShift Bot2017-05-172-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Default image policy on new clusters to onClayton Coleman2017-05-152-1/+23
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #4173 from ashcrow/1450310OpenShift Bot2017-05-171-5/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add regexp for container-engine lineinfileSteve Milner2017-05-161-0/+5
| * | | | | | | | | | | | | | | use dest instead of path for lineinfileSteve Milner2017-05-151-6/+6