You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/07/10 16:50:50 UTC

[17/50] couchdb commit: updated refs/heads/master to 6526051

rexi did not need merging


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0afec9a4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0afec9a4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0afec9a4

Branch: refs/heads/master
Commit: 0afec9a44c96acf0dd34d99c2d9cc600f25b5401
Parents: 3131cf0
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 15:54:35 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 15:54:35 2014 +0100

----------------------------------------------------------------------
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/0afec9a4/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 94844fa..024bf7b 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -32,7 +32,7 @@ DepDescs = [
     {mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
     {mochiweb, "couchdb-mochiweb", {branch, "master"}},
     {oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
-    {rexi, "couchdb-rexi", {branch, "1843-feature-bigcouch"}},
+    {rexi, "couchdb-rexi", {branch, "master"}},
     {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}}
 ],