Merge branch 'v0.6.0' into v0.6.0

CONTRIBUTING.md

@@ -6,7 +6,7 @@ If there's anything you'd like to change in the docs, you can click the **Edit**
 
 ### Contributing to the Blog
 
-The articles in Milvus Blog are generated from [this markdown sources](https://github.com/milvus-io/www.milvus.io/tree/master/website/blog). 
+The articles in Milvus Blog are generated from [this markdown sources](https://github.com/milvus-io/community/tree/master/blog). 
 
 If you want to write an article intended for the Blog, please [open an issue in the community repository](https://github.com/milvus-io/community/issues/new). In most cases, you might want to share your article on your own blog or other writing medium instead. It's worth asking, though, in case we find your article is a good fit for the Blog.
 

assets/config/server_config.yaml

@@ -29,7 +29,7 @@ metric_config:
     port: 8080                      # port prometheus uses to fetch metrics, must be in range [1025, 65534]
 
 cache_config:
-  cpu_cache_capacity: 4            # GB, CPU memory used for cache, must be a positive integer
+  cpu_cache_capacity: 4             # GB, CPU memory used for cache, must be a positive integer
   cache_insert_data: false          # whether to load inserted data into cache, must be a boolean
 
 engine_config:

assets/server_config.yaml

@@ -29,7 +29,7 @@ metric_config:
     port: 8080                      # port prometheus uses to fetch metrics, must be in range [1025, 65534]
 
 cache_config:
-  cpu_cache_capacity: 4            # GB, CPU memory used for cache, must be a positive integer
+  cpu_cache_capacity: 4             # GB, CPU memory used for cache, must be a positive integer
   cache_insert_data: false          # whether to load inserted data into cache, must be a boolean
 
 engine_config:

site/en/guides/get_started/install_milvus/cpu_milvus_docker.md

@@ -53,9 +53,9 @@ $ docker pull milvusdb/milvus:0.6.0-cpu-d120719-2b40dd
 ```shell
 # Create Milvus file
 $ mkdir -p /home/$USER/milvus/conf
-$ cd home/$USER/milvus/conf
-$ wget https://raw.githubusercontent.com/milvus-io/docs/blob/v0.6.0/assets/server_config.yaml
-$ wget https://raw.githubusercontent.com/milvus-io/docs/blob/v0.6.0/assets/config/log_config.conf
+$ cd /home/$USER/milvus/conf
+$ wget https://raw.githubusercontent.com/milvus-io/docs/v0.6.0/assets/server_config.yaml
+$ wget https://raw.githubusercontent.com/milvus-io/docs/v0.6.0/assets/config/log_config.conf
 ```
 > Note: In case you encounter problems downloading configuration files using `wget` command, you can also create the `server_config.yaml` and `log_config.conf` files under `/home/$USER/milvus/conf`, then copy and paste the content from [server config file](https://github.com/milvus-io/docs/blob/v0.6.0/assets/server_config.yaml) and [log config file](https://github.com/milvus-io/docs/blob/v0.6.0/assets/config/log_config.conf).
 

site/en/guides/get_started/install_milvus/gpu_milvus_docker.md

@@ -55,9 +55,9 @@ $ docker pull milvusdb/milvus:0.6.0-gpu-d120719-2b40dd
 ```shell
 # Create Milvus file
 $ mkdir -p /home/$USER/milvus/conf
-$ cd home/$USER/milvus/conf
-$ wget https://raw.githubusercontent.com/milvus-io/docs/blob/v0.6.0/assets/config/server_config.yaml
-$ wget https://raw.githubusercontent.com/milvus-io/docs/blob/v0.6.0/assets/config/log_config.conf
+$ cd /home/$USER/milvus/conf
+$ wget https://raw.githubusercontent.com/milvus-io/docs/v0.6.0/assets/config/server_config.yaml
+$ wget https://raw.githubusercontent.com/milvus-io/docs/v0.6.0/assets/config/log_config.conf
 ```
 
 > Note: In case you encounter problems downloading configuration files using `wget` command, you can also create the `server_config.yaml` and `log_config.conf` files under `/home/$USER/milvus/conf`, then copy and paste the content from [server config file](https://github.com/milvus-io/docs/blob/v0.6.0/assets/config/server_config.yaml) and [log config file](https://github.com/milvus-io/docs/blob/v0.6.0/assets/config/log_config.conf).

site/en/guides/milvus_operation.md

@@ -114,6 +114,7 @@ Status(code=0, message='Success')
 To verify if a table exists in Milvus, use this command:
 
 ```python
+<<<<<<< HEAD:site/en/guides/milvus_operation.md
 >>> status, exists = milvus.has_table('test01')
 >>> status     
 Status(code=0, message='Success')

site/zh-CN/guides/get_started/install_milvus/cpu_milvus_docker.md

@@ -52,9 +52,9 @@ $ docker pull milvusdb/milvus:0.6.0-cpu-d120719-2b40dd
 ```
 # Create Milvus file
 $ mkdir -p /home/$USER/milvus/conf
-$ cd home/$USER/milvus/conf
-$ wget https://raw.githubusercontent.com/milvus-io/docs/blob/v0.6.0/assets/server_config.yaml
-$ wget https://raw.githubusercontent.com/milvus-io/docs/blob/v0.6.0/assets/config/log_config.conf
+$ cd /home/$USER/milvus/conf
+$ wget https://raw.githubusercontent.com/milvus-io/docs/v0.6.0/assets/server_config.yaml
+$ wget https://raw.githubusercontent.com/milvus-io/docs/v0.6.0/assets/config/log_config.conf
 ```
 
 > 注意：万一您遇到无法通过 `wget` 命令正常下载配置文件的情况，您也可以在 `/home/$USER/milvus/conf` 路径下创建 `server_config.yaml` 和 `log_config.conf` 文件，然后复制粘贴 [server config 文件](https://github.com/milvus-io/docs/blob/v0.6.0/assets/server_config.yaml) 和 [log config 文件](https://github.com/milvus-io/docs/blob/v0.6.0/assets/config/log_config.conf)的内容。

site/zh-CN/guides/get_started/install_milvus/gpu_milvus_docker.md

@@ -54,9 +54,9 @@ $ docker pull milvusdb/milvus:0.6.0-gpu-d120719-2b40dd
 ```
 # Create Milvus file
 $ mkdir -p /home/$USER/milvus/conf
-$ cd home/$USER/milvus/conf
-$ wget https://raw.githubusercontent.com/milvus-io/docs/blob/v0.6.0/assets/config/server_config.yaml
-$ wget https://raw.githubusercontent.com/milvus-io/docs/blob/v0.6.0/assets/config/log_config.conf
+$ cd /home/$USER/milvus/conf
+$ wget https://raw.githubusercontent.com/milvus-io/docs/v0.6.0/assets/config/server_config.yaml
+$ wget https://raw.githubusercontent.com/milvus-io/docs/v0.6.0/assets/config/log_config.conf
 ```
 
 > 注意：万一您遇到无法通过 `wget` 命令正常下载配置文件的情况，您也可以在 `/home/$USER/milvus/conf` 路径下创建 `server_config.yaml` 和 `log_config.conf` 文件，然后复制粘贴 [server config 文件](https://github.com/milvus-io/docs/blob/v0.6.0/assets/config/server_config.yaml) 和 [log config 文件](https://github.com/milvus-io/docs/blob/v0.6.0/assets/config/log_config.conf)的内容。
@@ -65,6 +65,7 @@ $ wget https://raw.githubusercontent.com/milvus-io/docs/blob/v0.6.0/assets/confi
 
 ```shell
 # Start Milvus
+<<<<<<< HEAD:site/zh-CN/guides/get_started/install_milvus/gpu_milvus_docker.md
 $ docker run -d --name milvus_gpu --gpus all \
 -p 19530:19530 \
 -p 8080:8080 \

site/zh-CN/guides/milvus_operation.md

@@ -111,6 +111,7 @@ Status(code=0, message='Success')
 请用下列命令确认某张表是否存在：
 
 ```python
+<<<<<<< HEAD:site/zh-CN/guides/milvus_operation.md
 >>> status, exists = milvus.has_table('test01')
 >>> status     
 Status(code=0, message='Success')