Merge branch 'develop-2.9' into develop-2.9

Author: martinsumner

rebar.config

@@ -11,12 +11,12 @@
 
 {deps, [
   {lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "3.2.4"}}},
-  {poolboy, ".*", {git, "git://github.com/basho/poolboy.git", {branch, "develop-2.2.5"}}},
-  {basho_stats, ".*", {git, "git://github.com/basho/basho_stats.git", {branch, "master"}}},
+  {poolboy, ".*", {git, "git://github.com/basho/poolboy.git", {tag, "0.8.2"}}},
+  {basho_stats, ".*", {git, "git://github.com/basho/basho_stats.git", {tag, "1.0.3.5"}}},
   {riak_sysmon, ".*", {git, "https://github.com/basho/riak_sysmon.git", {tag, "2.1.5"}}},
   {eleveldb, ".*", {git, "git://github.com/martinsumner/eleveldb.git", {branch, "mas-2.0.34-ee"}}},
-  {riak_ensemble, ".*", {git, "https://github.com/basho/riak_ensemble", {branch, "develop-2.2"}}},
-  {pbkdf2, ".*", {git, "git://github.com/basho/erlang-pbkdf2.git", {branch, "master"}}},
-  {exometer_core, ".*", {git, "git://github.com/basho/exometer_core.git", {branch, "master"}}},
-  {clique, ".*", {git, "https://github.com/basho/clique.git", {branch, "develop-2.2"}}}
+  {riak_ensemble, ".*", {git, "https://github.com/basho/riak_ensemble", {tag, "2.1.9"}}},
+  {pbkdf2, ".*", {git, "git://github.com/basho/erlang-pbkdf2.git", {tag, "2.0.1"}}},
+  {exometer_core, ".*", {git, "git://github.com/basho/exometer_core.git", {tag, "1.0.1-basho10"}}},
+  {clique, ".*", {git, "https://github.com/basho/clique.git", {tag, "0.3.10"}}}
 ]}.