Merge branch '2.2'

This commit is contained in:
Martynas Pumputis committed 2018-03-08 14:38:46 +01:00
commit ac78762910
1 file changed
+2
@@ -101,6 +101,8 @@ items:
name: weave-net
namespace: kube-system
spec:
# Wait 5 seconds to let pod connect before rolling next pod
minReadySeconds: 5
template:
metadata:
labels: