Merge remote-tracking branch 'origin/develop' into feature/zl/add-int…

…erface-for-pb-bucket-key-active-preflist
basho · Feb 16, 2015 · c77edc0 · c77edc0
2 parents 653ca41 + d287d0c
commit c77edc0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rebar.config b/rebar.config
@@ -4,7 +4,7 @@
 {deps, [
         {riak_pb, "2.0.0.16", {git, "git://github.com/basho/riak_pb.git", {tag, "2.0.0.16"}}},
         {webmachine, "1.10.5", {git, "git://github.com/basho/webmachine.git", {tag, "1.10.5"}}},
-        {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {branch, "2.0"}}}
+        {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {branch, "develop"}}}
         ]}.
 
 {xref_checks, [undefined_function_calls]}.