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:51 UTC
[18/50] couchdb commit: updated refs/heads/master to 6526051
mem3 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/d1cdd097
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d1cdd097
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d1cdd097
Branch: refs/heads/master
Commit: d1cdd0976bb2034b95be729470fbd0192de68946
Parents: 0afec9a
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 15:55:49 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 15:55:49 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d1cdd097/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 024bf7b..e066130 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -29,7 +29,7 @@ DepDescs = [
{fabric, "couchdb-fabric", {branch, "master"}},
{ibrowse, "couchdb-ibrowse", {tag, "CouchDB-1.1.0"}},
{jiffy, "couchdb-jiffy", {branch, "master"}},
- {mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
+ {mem3, "couchdb-mem3", {branch, "master"}},
{mochiweb, "couchdb-mochiweb", {branch, "master"}},
{oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
{rexi, "couchdb-rexi", {branch, "master"}},