Merge pull request kubernetes#13659 from linzichang/fix-ip-conflict

Auto commit by PR queue bot
lavalamp · Sep 17, 2015 · ef33c2f · ef33c2f
2 parents 48275aa + 34ad303
commit ef33c2f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cluster/libvirt-coreos/network_kubernetes_pods.xml b/cluster/libvirt-coreos/network_kubernetes_pods.xml
@@ -1,6 +1,6 @@
 <network>
   <name>kubernetes_pods</name>
   <bridge name='virbr_kub_pods' stp='off' delay='0'/>
-  <ip address='10.10.0.1' netmask='255.255.0.0'>
+  <ip address='10.10.0.100' netmask='255.255.0.0'>
   </ip>
 </network>