Merge branch '1.3'

Conflicts:
	RELEASE-NOTES.md
	rel/files/vm.args
	rel/reltool.config

rel/files/app.config

@@ -179,13 +179,12 @@
             %% operations
             {listkeys_backpressure, true},
 
-            %% This option configures the riak_kv health check that monitors
-            %% message queue lengths of riak_kv vnodes. The value is a 2-tuple,
-            %% {EnableThreshold, DisableThreshold}. If a riak_kv_vnode's message
-            %% queue length reaches DisableThreshold the riak_kv service is disabled
-            %% on this node. The service will not be re-enabled until the message queue
-            %% length drops below EnableThreshold.
-            {vnode_mailbox_limit, {1, 5000}}
+            %% This option specifies how many of each type of fsm may exist
+            %% concurrently.  This is for overload protection and is a new
+            %% mechanism that obsoletes 1.3's health checks. Note that this number
+            %% represents two potential processes, so +P in vm.args should be at 
+            %% least 3X the fsm_limit.
+            {fsm_limit, 50000}
            ]},
 
  %% Riak Search Config

rel/files/vm.args

@@ -39,11 +39,14 @@
 ## See: http://www.erlang.org/doc/man/erl.html#%2bzdbbl
 ##+zdbbl 32768
 
+## Raise the default erlang process limit 
++P 256000
+
 ## Erlang VM scheduler tuning.
 ## Prerequisite: a patched VM from Basho, or a VM compiled separately
 ## with this patch applied:
 ##     https://gist.github.com/slfritchie/5624609
-##+scl false +zdss 500:500
+##+scl false +zdss 50:50
 
 ## Begin SSL distribution items, DO NOT DELETE OR EDIT THIS COMMENT