From cf8426d8448beab612c08eaa4066523099dbbb9f Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Thu, 7 May 2015 13:54:24 -0700
Subject: [PATCH] merge the v1beta3 json file in the resource quota example

---
 examples/resourcequota/resource-quota.json    | 10 ++++++----
 .../resourcequota/v1beta3/resource-quota.json | 19 -------------------
 2 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 examples/resourcequota/v1beta3/resource-quota.json

diff --git a/examples/resourcequota/resource-quota.json b/examples/resourcequota/resource-quota.json
index ea7394ce748..c062eb82e6f 100644
--- a/examples/resourcequota/resource-quota.json
+++ b/examples/resourcequota/resource-quota.json
@@ -1,17 +1,19 @@
 {
-  "id": "quota",
+  "apiVersion": "v1beta3",
   "kind": "ResourceQuota",
-  "apiVersion": "v1beta1",
+  "metadata": {
+    "name": "quota"
+  },
   "spec": {
     "hard": {
-      "memory": "1073741824",
+      "memory": "1Gi",
       "cpu": "20",
       "pods": "10",
       "services": "5",
       "replicationcontrollers":"20",
       "resourcequotas":"1",
       "secrets":"10",
-      "persistentvolumeclaims":"10"      
+      "persistentvolumeclaims":"10"
     }
   }
 }
diff --git a/examples/resourcequota/v1beta3/resource-quota.json b/examples/resourcequota/v1beta3/resource-quota.json
deleted file mode 100644
index c062eb82e6f..00000000000
--- a/examples/resourcequota/v1beta3/resource-quota.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "apiVersion": "v1beta3",
-  "kind": "ResourceQuota",
-  "metadata": {
-    "name": "quota"
-  },
-  "spec": {
-    "hard": {
-      "memory": "1Gi",
-      "cpu": "20",
-      "pods": "10",
-      "services": "5",
-      "replicationcontrollers":"20",
-      "resourcequotas":"1",
-      "secrets":"10",
-      "persistentvolumeclaims":"10"
-    }
-  }
-}