vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5184 from gyuho/typo 

*: fix flag location, minor typo
release-3.0
Gyu-Ho Lee 2016-04-25 09:59:24 -07:00
parent 3ae956eb89 3ad8e91e00
commit 1378e72bc2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdctl/ctlv3/command/make_mirror_command.go
View File

@ -45,7 +45,7 @@ func NewMakeMirrorCommand() *cobra.Command {
}
c.Flags().StringVar(&mmprefix, "prefix", "", "the key-value prefix to mirror")
// TODO: add dest-prefix to mirror a prefix to a different prefix in the destionation cluster?
// TODO: add dest-prefix to mirror a prefix to a different prefix in the destination cluster?
c.Flags().StringVar(&mmcert, "dest-cert", "", "identify secure client using this TLS certificate file for the destination cluster")
c.Flags().StringVar(&mmkey, "dest-key", "", "identify secure client using this TLS key file")
c.Flags().StringVar(&mmcacert, "dest-cacert", "", "verify certificates of TLS enabled secure servers using this CA bundle")
@ -57,7 +57,7 @@ func NewMakeMirrorCommand() *cobra.Command {
func makeMirrorCommandFunc(cmd *cobra.Command, args []string) {
if len(args) != 1 {
ExitWithError(ExitBadArgs, errors.New("make-mirror takes one destination arguement."))
ExitWithError(ExitBadArgs, errors.New("make-mirror takes one destination argument."))
}
dialTimeout := dialTimeoutFromCmd(cmd)

8
etcdmain/config.go
View File

@ -87,8 +87,9 @@ type config struct {
// TickMs is the number of milliseconds between heartbeat ticks.
// TODO: decouple tickMs and heartbeat tick (current heartbeat tick = 1).
// make ticks a cluster wide configuration.
TickMs uint
ElectionMs uint
TickMs uint
ElectionMs uint
quotaBackendBytes int64
// clustering
apurls, acurls []url.URL
@ -123,7 +124,6 @@ type config struct {
printVersion bool
autoCompactionRetention int
quotaBackendBytes int64
enablePprof bool
@ -167,6 +167,7 @@ func NewConfig() *config {
fs.Uint64Var(&cfg.snapCount, "snapshot-count", etcdserver.DefaultSnapCount, "Number of committed transactions to trigger a snapshot to disk.")
fs.UintVar(&cfg.TickMs, "heartbeat-interval", 100, "Time (in milliseconds) of a heartbeat interval.")
fs.UintVar(&cfg.ElectionMs, "election-timeout", 1000, "Time (in milliseconds) for an election to timeout.")
fs.Int64Var(&cfg.quotaBackendBytes, "quota-backend-bytes", 0, "Raise alarms when backend size exceeds the given quota. 0 means use the default quota.")
// clustering
fs.Var(flags.NewURLsValue(defaultInitialAdvertisePeerURLs), "initial-advertise-peer-urls", "List of this member's peer URLs to advertise to the rest of the cluster.")
@ -225,7 +226,6 @@ func NewConfig() *config {
// demo flag
fs.IntVar(&cfg.autoCompactionRetention, "experimental-auto-compaction-retention", 0, "Auto compaction retention in hour. 0 means disable auto compaction.")
fs.Int64Var(&cfg.quotaBackendBytes, "quota-backend-bytes", 0, "Raise alarms when backend size exceeds the given quota. 0 means use the default quota.")
// backwards-compatibility with v0.4.6
fs.Var(&flags.IPAddressPort{}, "addr", "DEPRECATED: Use --advertise-client-urls instead.")