Bug 1252, unifying JSON API around vBucket instead of vbucket

Change-Id: I5da7051a6f286d3ee48e7898287ae2f3f6254263 Reviewed-on: http://review.northscale.com:8080/379 Reviewed-by: Dustin Sallings <dustin@spy.net> Tested-by: Dustin Sallings <dustin@spy.net>
membase · Jun 10, 2010 · d8de04c · d8de04c
1 parent 2f89dc9
commit d8de04c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/vbucket.c b/src/vbucket.c
@@ -155,7 +155,7 @@ static int populate_buckets(struct vbucket_config_st *vb, cJSON *c) {
 }
 
 static VBUCKET_CONFIG_HANDLE parse_cjson(cJSON *c) {
-    cJSON *body = cJSON_GetObjectItem(c, "vbucketServerMap");
+    cJSON *body = cJSON_GetObjectItem(c, "vBucketServerMap");
     if (body != NULL) {
         return parse_cjson(body); // Allows clients to have a JSON envelope.
     }

diff --git a/tests/testapp.c b/tests/testapp.c
@@ -35,7 +35,7 @@ static const char *configFlat =
 
 static const char *configInEnvelope =
 "{ \"otherKeyThatIsIgnored\": 12345,\n"
-  "\"vbucketServerMap\": \n"
+  "\"vBucketServerMap\": \n"
     "{\n"
     "  \"hashAlgorithm\": \"CRC\",\n"
     "  \"numReplicas\": 2,\n"
@@ -59,7 +59,7 @@ static const char *configInEnvelope2 =
              "\"ports\":{\"proxy\":11213,\"direct\":11212},"
              "\"uptime\":\"0\",\"memoryTotal\":0,\"memoryFree\":0,\"mcdMemoryReserved\":64,\"mcdMemoryAllocated\":0}],"
  "\"stats\":{\"uri\":\"/pools/default/buckets/default/stats\"},"
- "\"vbucketServerMap\": "
+ "\"vBucketServerMap\": "
     "{"
     "  \"hashAlgorithm\": \"CRC\","
     "  \"numReplicas\": 2,"