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

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-17 16:03:39 -07:00
commit ef33c2faa4

View File

@ -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>