Merge remote-tracking branch 'couchbase/neo'

* MB-51573 Add storageBackend to terse bucket info

Change-Id: I48486a03c67bce5b0c5c52ad4913dcdd8644d936

Author: stevewatanabe

src/bucket_info_cache.erl

@@ -185,6 +185,7 @@ build_short_bucket_info(Id, BucketConfig, Snapshot) ->
     BucketUUID = ns_bucket:uuid(Id, Snapshot),
     [build_name_and_locator(Id, BucketConfig),
      {bucketType, ns_bucket:external_bucket_type(BucketConfig)},
+     {storageBackend, ns_bucket:storage_backend(BucketConfig)},
      {uuid, BucketUUID},
      {uri, build_pools_uri(["buckets", Id], BucketUUID)},
      {streamingUri, build_pools_uri(["bucketsStreaming", Id], BucketUUID)},

src/menelaus_web_buckets.erl

@@ -300,7 +300,6 @@ build_dynamic_bucket_info(InfoLevel, Id, BucketConfig, Ctx) ->
                 {rawRAM, ns_bucket:raw_ram_quota(BucketConfig)}]}},
       {basicStats, {build_bucket_stats(InfoLevel, Id, Ctx)}},
       {evictionPolicy, build_eviction_policy(BucketConfig)},
-      {storageBackend, ns_bucket:storage_backend(BucketConfig)},
       {durabilityMinLevel, build_durability_min_level(BucketConfig)},
       build_pitr_dynamic_bucket_info(BucketConfig),
       build_magma_bucket_info(BucketConfig),