merge master to 1.10, with fixes (#7682)

docs/concepts/cluster-administration/device-plugins.md

@@ -147,9 +147,16 @@ For examples of device plugin implementations, see:
 * The official [NVIDIA GPU device plugin](https://github.com/NVIDIA/k8s-device-plugin)
     * it requires using [nvidia-docker 2.0](https://github.com/NVIDIA/nvidia-docker) which allows you to run GPU enabled docker containers
 * The [NVIDIA GPU device plugin for COS base OS](https://github.com/GoogleCloudPlatform/container-engine-accelerators/tree/master/cmd/nvidia_gpu).
+<<<<<<< HEAD
 * The [RDMA device plugin](https://github.com/hustcat/k8s-rdma-device-plugin)
 * The [Solarflare device plugin](https://github.com/vikaschoudhary16/sfc-device-plugin)
 * The [AMD GPU device plugin](https://github.com/RadeonOpenCompute/k8s-device-plugin)
+||||||| merged common ancestors
+
+=======
+* The [RDMA device plugin](https://github.com/hustcat/k8s-rdma-device-plugin)
+
+>>>>>>> merge master to 1.10, with fixes (#7682)
 {% endcapture %}
 
 {% include templates/concept.md %}

docs/concepts/cluster-administration/logging.md

@@ -1,5 +1,13 @@
 ---
+<<<<<<< HEAD
 reviewers:
+||||||| merged common ancestors
+approvers:
+- crassirostris
+=======
+reviewers:
+- crassirostris
+>>>>>>> merge master to 1.10, with fixes (#7682)
 - piosz
 - x13n
 title: Logging Architecture

docs/concepts/cluster-administration/manage-deployment.md

@@ -55,7 +55,13 @@ deployment "nginx-deployment" created
 Resource creation isn't the only operation that `kubectl` can perform in bulk. It can also extract resource names from configuration files in order to perform other operations, in particular to delete the same resources you created:
 
 ```shell
+<<<<<<< HEAD
 $ kubectl delete -f https://k8s.io/docs/concepts/cluster-administration/nginx-app.yaml
+||||||| merged common ancestors
+$ kubectl delete -f docs/user-guide/nginx/
+=======
+$ kubectl delete -f https://k8s.io/docs/concepts/cluster-administration/nginx/
+>>>>>>> merge master to 1.10, with fixes (#7682)
 deployment "my-nginx" deleted
 service "my-nginx-svc" deleted
 ```

docs/concepts/cluster-administration/nginx-deployment.yaml~merge master to 1.10, with fixes (#7682)

@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+spec:
+  selector:
+    matchLabels:
+      app: nginx
+  replicas: 3
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:1.7.9
+        ports:
+        - containerPort: 80

docs/concepts/cluster-administration/nginx/nginx-deployment.yaml~merge master to 1.10, with fixes (#7682)

@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: my-nginx
+spec:
+  selector:
+    matchLabels:
+      app: nginx
+  replicas: 3
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:1.7.9
+        ports:
+        - containerPort: 80