diff --git a/src/main/docbkx/configuration.xml b/src/main/docbkx/configuration.xml
index 56a3dd712d1..d2798da8fd0 100644
--- a/src/main/docbkx/configuration.xml
+++ b/src/main/docbkx/configuration.xml
@@ -1303,7 +1303,7 @@ index e70ebc6..96f8c27 100644
+ xml:id="hbase.regionserver.handler.count-description">
hbase.regionserver.handler.count
This setting defines the number of threads that are kept open to answer incoming
requests to user tables. The rule of thumb is to keep this number low when the payload per
diff --git a/src/main/docbkx/developer.xml b/src/main/docbkx/developer.xml
index 2628a7b2207..ccfdbbe89b1 100644
--- a/src/main/docbkx/developer.xml
+++ b/src/main/docbkx/developer.xml
@@ -1020,17 +1020,20 @@ As you can see from the log, ChaosMonkey started the default PeriodicRandomActio
The various properties that can be configured and their default values can be found listed in the
org.apache.hadoop.hbase.chaos.factories.MonkeyConstants class.
If any chaos monkey configuration is missing from the property file, then the default values are assumed.
- For example:
- $ bin/hbase org.apache.hadoop.hbase.IntegrationTestIngest -m slowDeterministic -monkeyProps monkey.properties
- The above command will start the integration tests and chaos monkey passing the properties file monkey.properties.
- Here is an example chaos monkey file:
- sdm.action1.period=120000
+ For example:
+
+$bin/hbase org.apache.hadoop.hbase.IntegrationTestIngest -m slowDeterministic -monkeyProps monkey.properties
+
+ The above command will start the integration tests and chaos monkey passing the properties file monkey.properties.
+ Here is an example chaos monkey file:
+
+sdm.action1.period=120000
sdm.action2.period=40000
move.regions.sleep.time=80000
move.regions.max.time=1000000
move.regions.sleep.time=80000
-batch.restart.rs.ratio=0.4f
-
+batch.restart.rs.ratio=0.4f
+
@@ -1635,7 +1638,7 @@ If a committer wishes to improve an unacceptable patch, then it should first be
Include the Jira issue id in the commit message, along with a short description of the change and the name of the contributor if it is not you.
Be sure to get the issue id right, as this causes Jira to link to the change in Subversion (use the issue's "All" tab to see these).
Resolve the issue as fixed, thanking the contributor.
-Always set the "Fix Version" at this point, but please only set a single fix version, the earliest release in which the change will appear.
+Always set the "Fix Version" at this point, but please only set a single fix version, the earliest release in which the change will appear.
Add Amending-Author when a conflict cherrypick backporting