Merge remote-tracking branch 'couchbase/cheshire-cat'

*  Revert "MB-47768: Make clusterEncryptionLevel available on pools/default"

Change-Id: Ida50438a58b006b42637d3f23cc57cb65629d44d

Author: anuthan

src/menelaus_web_pools.erl

@@ -233,7 +233,6 @@ do_build_pool_info(Id, InfoLevel, Stability, LocalAddr) ->
           <<"/pools/default/serverGroups?v=",
             (list_to_binary(integer_to_list(GroupsV)))/binary>>},
          {clusterName, list_to_binary(get_cluster_name())},
-         {clusterEncryptionLevel, misc:get_cluster_encryption_level(Config)},
          {balanced, ns_cluster_membership:is_balanced()},
          build_check_permissions_uri(InfoLevel, Id, Snapshot),
          menelaus_web_node:build_memory_quota_info(Config),

src/misc.erl

@@ -1521,17 +1521,13 @@ is_cluster_encryption_fully_disabled() ->
 
 -spec get_cluster_encryption_level() -> none | control | all | strict.
 get_cluster_encryption_level() ->
-    get_cluster_encryption_level(ns_config:latest()).
-
--spec get_cluster_encryption_level(term()) -> none | control | all | strict.
-get_cluster_encryption_level(Config) ->
     Default = case is_cluster_encryption_fully_enabled() of
                   true ->
                       control;
                   false ->
                       none
               end,
-    ns_config:search(Config, cluster_encryption_level, Default).
+    ns_config:search(ns_config:latest(), cluster_encryption_level, Default).
 
 -spec should_cluster_data_be_encrypted() -> true | false.
 should_cluster_data_be_encrypted() ->