fix minor mistakes in pouch_with_runV.md docs

the runV build path should be $Home/go/src/github.com/hyperhq fix minor mistakes in pouch_with_runV.md docs the runV build path should be $Home/go/src/github.com/hyperhq docs: update cri-related docs to revise pouch config file Signed-off-by: Zou Rui <21751189@zju.edu.cn> Revert "fix minor mistakes in pouch_with_runV.md docs" This reverts commit f8811da. fix docs ...
AliyunContainerService · Apr 24, 2018 · f200212 · f200212
1 parent 66b6396
commit f200212
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/docs/features/pouch_with_runV.md b/docs/features/pouch_with_runV.md
@@ -47,8 +47,8 @@ sudo yum install -y qemu qemu-kvm
 First, clone version v1.0.0 of runv project from GitHub:
 
 ```
-mkdir -p $Home/go/src/github.com/hyper
-cd $Home/go/src/github.com/hyper
+mkdir -p $Home/go/src/github.com/hyperhq
+cd $Home/go/src/github.com/hyperhq
 git clone --branch v1.0.0 https://github.com/hyperhq/runv.git
 export GOPATH=$HOME/go
 ```
@@ -72,7 +72,7 @@ Then binary runv will be located in your PATH.
 [hyperstart](https://github.com/hyperhq/hyperstart) provides init task for hypervisor-based containers. We need to build guest kernel and initrd.img from source code version v1.0.0 as well:
 
 ```
-cd $Home/go/src/github.com/hyper
+cd $Home/go/src/github.com/hyperhq
 git clone --branch v1.0.0 https://github.com/hyperhq/hyperstart.git
 cd hyperstart
 ./autogen.sh

diff --git a/docs/kubernetes/pouch_with_kubernetes_deploying.md b/docs/kubernetes/pouch_with_kubernetes_deploying.md
@@ -37,9 +37,12 @@ An all-in-one kubernetes cluster with pouch runtime could be deployed by running
 hack/kubernetes/allinone.sh
 
 ```
-
+<<<<<<< HEAD
+Please refer to [allinone](https://github.com/alibaba/pouch/blob/master/hack/kubernetes/allinone.sh) .
+=======
 Please refer to [allinone](https://github.com/alibaba/pouch/blob/master/hack/kubernetes/allinone.sh) .
 
+>>>>>>> ...
 ### Install Pouch
 
 You can easily setup a basic Pouch environment, see [INSTALLATION.md](../../INSTALLATION.md).
@@ -256,4 +259,8 @@ rtt min/avg/max/mdev = 0.041/0.055/0.068/0.012 ms
 
 - By default Pouch will use `registry.cn-hangzhou.aliyuncs.com/google-containers/pause-amd64:3.0` as the image of infra container. If you'd like use image other than that, you could start pouchd with the configuration like `pouchd --enable-cri --sandbox-image XXX`.
 
+<<<<<<< HEAD
+- Any other troubles? Make an issue to connect with us!
+=======
 - Any other troubles? Make an issue to connect with us!
+>>>>>>> ...