Merge branch 'master' into release-1.3

# Conflicts: # docs/admin/resourcequota/index.md # docs/admin/resourcequota/object-counts.yaml # docs/admin/resourcequota/walkthrough.md # docs/user-guide/downward-api/index.md
2016-07-07 02:00:32 -07:00
parent 660f53a39c 8dc87a6aa9
commit cef1accd9d
119 changed files with 3269 additions and 792 deletions
@@ -6,4 +6,4 @@ spec:
  hard:
    persistentvolumeclaims: "2"
    services.loadbalancers: "2"    
-    services.nodeports: "0"
+    services.nodeports: "0"
@@ -74,6 +74,7 @@ services.nodeports     0    0

 The quota system will now prevent users from creating more than the specified amount for each resource.

+
 ## Step 3: Apply a compute-resource quota to the namespace

 To limit the amount of compute resource that can be consumed in this namespace,
@@ -124,6 +125,7 @@ $ kubectl get pods --namespace=quota-example
 ```

 What happened?  I have no pods!  Let's describe the deployment to get a view of what is happening.
+<<<<<<< HEAD

 ```shell
 $ kubectl describe deployment nginx --namespace=quota-example