summaryrefslogtreecommitdiffstats
path: root/roles/calico/templates/calico.service.j2
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-25 04:32:28 -0700
committerGitHub <noreply@github.com>2017-09-25 04:32:28 -0700
commitc390d382a2c1783964179490eec810ee2206fa32 (patch)
tree61f7c8cfa78d2f2b83746a90585a6310246148b8 /roles/calico/templates/calico.service.j2
parent0b84e0d47b5912afb6db4f1964cbb06defcab09f (diff)
parentce7061a316834b15752fc03feeeb387a487af51f (diff)
downloadopenshift-c390d382a2c1783964179490eec810ee2206fa32.tar.gz
openshift-c390d382a2c1783964179490eec810ee2206fa32.tar.bz2
openshift-c390d382a2c1783964179490eec810ee2206fa32.tar.xz
openshift-c390d382a2c1783964179490eec810ee2206fa32.zip
Merge pull request #5492 from jsafrane/local-storage-predicate
Automatic merge from submit-queue Add 3.7 scheduler predicates In 3.7 we added NoVolumeNodeConflict and MaxAzureDiskVolumeCount predicate that needs to be installed. Check carefully, I tested it on my virtual machine, but I did not manage to run the test.
Diffstat (limited to 'roles/calico/templates/calico.service.j2')
0 files changed, 0 insertions, 0 deletions