Merge pull request #159 from nimishzynga/changes

Adding metakv for cfg
couchbaselabs · Jul 27, 2015 · 0116dfb · 0116dfb
2 parents 6c69ffc + d266b99
commit 0116dfb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/cmd/cbft/main_flags.go b/cmd/cbft/main_flags.go
@@ -93,6 +93,11 @@ func initFlags(flags *Flags) map[string][]string {
 			"\n       configuration provider manages a configuration"+
 			"\n       for a single, unclustered cbft node in a local"+
 			"\n       file that's stored in the dataDir;"+
+            "\n* metakv"+
+			"\n     - manages a cbft cluster configuration in couchbase metakv store"+
+			"\n       environment variable CBAUTH_REVRPC_URL need to be set"+
+			"\n       for metakv. for example:"+
+            "\n       'export CBAUTH_REVRPC_URL=http://user:password@localhost:9000/cbft';"+
 			"\ndefault is 'simple'.")
 	s(&flags.Container,
 		[]string{"container"}, "PATH", "",

diff --git a/docs/admin-guide/command.md b/docs/admin-guide/command.md
@@ -27,6 +27,11 @@ That will print out usage/help output...
                  configuration provider manages a configuration
                  for a single, unclustered cbft node in a local
                  file that's stored in the dataDir;
+          * metakv
+               - manages a cbft cluster configuration in couchbase metakv store
+                 environment variable CBAUTH_REVRPC_URL need to be set
+                 for metakv. for example:
+                 'export CBAUTH_REVRPC_URL=http://user:password@localhost:9000/cbft';
           default is 'simple'.
       -container PATH
           optional slash separated path of logical parent containers