gerrit.opnfv Code Review - container4nfv.git/commit

author	Guo Ruijing <ruijing.guo@intel.com>
	Mon, 12 Nov 2018 20:13:50 +0000 (04:13 +0800)
committer	Guo Ruijing <ruijing.guo@intel.com>
	Mon, 12 Nov 2018 20:13:50 +0000 (04:13 +0800)
commit	305eefa0439bef9f0edac786160ca8ed00e1942c
tree	2a9e0e220b28168e1cd4ceeabf0177d3f4519ae5	tree \| snapshot
parent	ec3b5f68c57cfd85cb1178614be40c9af9e34fad	commit \| diff

rebase multus

Change-Id: Ia82ed5f71ad7fdd49bfc71614ebf0d52920de610
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>

13 files changed:

src/cni/multus/install_cni.sh	[deleted file]	blob \| history
src/vagrant/kubeadm/Vagrantfile	[moved from src/vagrant/kubeadm_multus/Vagrantfile with 66% similarity]	diff \| blob \| history
src/vagrant/kubeadm/deploy.sh	[moved from src/vagrant/kubeadm_multus/deploy.sh with 63% similarity]	diff \| blob \| history
src/vagrant/kubeadm/host_setup.sh	[new file with mode: 0644]	blob
src/vagrant/kubeadm/master_setup.sh	[new file with mode: 0644]	blob
src/vagrant/kubeadm/multus/Dockerfile	[new file with mode: 0644]	blob
src/vagrant/kubeadm/multus/busybox.yaml	[moved from src/vagrant/kubeadm_multus/examples/busybox.yaml with 100% similarity]	blob \| history
src/vagrant/kubeadm/multus/cni_multus.yml	[moved from src/cni/multus/kube_cni_multus.yml with 69% similarity]	diff \| blob \| history
src/vagrant/kubeadm/multus/multus.sh	[moved from src/vagrant/kubeadm_multus/examples/multus.sh with 95% similarity]	diff \| blob \| history
src/vagrant/kubeadm/registry_setup.sh	[new file with mode: 0644]	blob
src/vagrant/kubeadm/worker_setup.sh	[moved from src/vagrant/kubeadm_multus/worker_setup.sh with 58% similarity]	diff \| blob \| history
src/vagrant/kubeadm_multus/host_setup.sh	[deleted file]	blob \| history
src/vagrant/kubeadm_multus/master_setup.sh	[deleted file]	blob \| history