aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislusf <chris.lu@gmail.com>2015-03-11 10:01:08 -0700
committerchrislusf <chris.lu@gmail.com>2015-03-11 10:01:08 -0700
commit85efc37320c38f8a74818fa9efb1badcb2541d46 (patch)
tree355888079d72884b5e735b2df9ff2a32be81baae
parentb07d81fb088638909ace217f4f2eb7927f094682 (diff)
downloadseaweedfs-85efc37320c38f8a74818fa9efb1badcb2541d46.tar.xz
seaweedfs-85efc37320c38f8a74818fa9efb1badcb2541d46.zip
marking weedfs.conf as deprecating.
The conf settings currently is duplicating with command line options.
-rw-r--r--go/weed/master.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/go/weed/master.go b/go/weed/master.go
index 1e2a6f0af..a6dcd363b 100644
--- a/go/weed/master.go
+++ b/go/weed/master.go
@@ -36,7 +36,7 @@ var (
masterPeers = cmdMaster.Flag.String("peers", "", "other master nodes in comma separated ip:port list")
volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 30*1000, "Master stops directing writes to oversized volumes.")
mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats")
- confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "xml configuration file")
+ confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "Deprecating! xml configuration file")
defaultReplicaPlacement = cmdMaster.Flag.String("defaultReplication", "000", "Default replication type if not specified.")
mTimeout = cmdMaster.Flag.Int("idleTimeout", 10, "connection idle seconds")
mMaxCpu = cmdMaster.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs")