scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 12:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-17 16:03:39 -07:00
parent 48275aa944 34ad303dda
commit ef33c2faa4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/libvirt-coreos/network_kubernetes_pods.xml
View File

@@ -1,6 +1,6 @@
<network> <network>
<name>kubernetes_pods</name> <name>kubernetes_pods</name>
<bridge name='virbr_kub_pods' stp='off' delay='0'/> <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> </ip>
</network> </network>