From d68664841c599d856dc49400dfc0f7aedc9d08a9 Mon Sep 17 00:00:00 2001
From: Xiang Li <xiangli.cs@gmail.com>
Date: Fri, 17 Jun 2016 10:04:31 -0700
Subject: [PATCH] *: make auto-compaction-retention non-experimental

---
 Documentation/op-guide/configuration.md |  5 +++++
 Documentation/op-guide/maintenance.md   |  4 ++--
 etcdmain/config.go                      |  3 +--
 etcdmain/help.go                        | 10 +++-------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Documentation/op-guide/configuration.md b/Documentation/op-guide/configuration.md
index 0934b4bb6..192b5783d 100644
--- a/Documentation/op-guide/configuration.md
+++ b/Documentation/op-guide/configuration.md
@@ -135,6 +135,11 @@ To start etcd automatically using custom settings at startup in Linux, using a [
 + default: false
 + env variable: ETCD_STRICT_RECONFIG_CHECK
 
+### --auto-compaction-retention
++ Auto compaction retention for mvcc key value store in hour. 0 means disable auto compaction.
++ default: 0
++ env variable: ETCD_AUTO_COMPACTION_RETENTION
+
 ## Proxy Flags
 
 `--proxy` prefix flags configures etcd to run in [proxy mode][proxy].
diff --git a/Documentation/op-guide/maintenance.md b/Documentation/op-guide/maintenance.md
index 11d934a8e..62703f067 100644
--- a/Documentation/op-guide/maintenance.md
+++ b/Documentation/op-guide/maintenance.md
@@ -12,11 +12,11 @@ Since etcd keeps an exact history of its keyspace, this history should be period
 
 The keyspace can be compacted automatically with `etcd`'s time windowed history retention policy, or manually with `etcdctl`. The `etcdctl` method provides fine-grained control over the compacting process whereas automatic compacting fits applications that only need key history for some length of time.
 
-`etcd` can be set to automatically compact the keyspace with the `--experimental-auto-compaction` option with a period of hours:
+`etcd` can be set to automatically compact the keyspace with the `--auto-compaction` option with a period of hours:
 
 ```sh
 # keep one hour of history
-$ etcd --experimental-auto-compaction-retention=1
+$ etcd --auto-compaction-retention=1
 ```
 
 An `etcdctl` initiated compaction works as follows:
diff --git a/etcdmain/config.go b/etcdmain/config.go
index 61c50ddff..5f0d0909e 100644
--- a/etcdmain/config.go
+++ b/etcdmain/config.go
@@ -256,8 +256,7 @@ func NewConfig() *config {
 	// version
 	fs.BoolVar(&cfg.printVersion, "version", false, "Print the version and exit.")
 
-	// demo flag
-	fs.IntVar(&cfg.autoCompactionRetention, "experimental-auto-compaction-retention", 0, "Auto compaction retention in hour. 0 means disable auto compaction.")
+	fs.IntVar(&cfg.autoCompactionRetention, "auto-compaction-retention", 0, "Auto compaction retention for mvcc key value store in hour. 0 means disable auto compaction.")
 
 	// backwards-compatibility with v0.4.6
 	fs.Var(&flags.IPAddressPort{}, "addr", "DEPRECATED: Use --advertise-client-urls instead.")
diff --git a/etcdmain/help.go b/etcdmain/help.go
index 826ce5e00..e63564398 100644
--- a/etcdmain/help.go
+++ b/etcdmain/help.go
@@ -81,6 +81,8 @@ clustering flags:
 		dns srv domain used to bootstrap the cluster.
 	--strict-reconfig-check
 		reject reconfiguration requests that would cause quorum loss.
+	--auto-compaction-retention '0'
+		auto compaction retention in hour. 0 means disable auto compaction.
 
 proxy flags:
 
@@ -139,13 +141,7 @@ given by the consensus protocol.
 
 	--force-new-cluster 'false'
 		force to create a new one-member cluster.
-
-
-experimental flags:
-
-	--experimental-auto-compaction-retention '0'
-		auto compaction retention in hour. 0 means disable auto compaction.
-
+	
 profiling flags:
 	--enable-pprof 'false'
 		Enable runtime profiling data via HTTP server. Address is at client URL + "/debug/pprof"