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:44 UTC
[11/50] couchdb commit: updated refs/heads/master to 6526051
couch is merged
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/69693aaa
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/69693aaa
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/69693aaa
Branch: refs/heads/master
Commit: 69693aaa4a5637ee3018420333ea8734887fec70
Parents: f448e2b
Author: Robert Newson <rn...@apache.org>
Authored: Tue May 6 13:42:17 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue May 6 13:42:17 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/69693aaa/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 83e7521..5f2a6ce 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -20,7 +20,7 @@ DepDescs = [
{couch_log, "couchdb-couch-log", {branch, "master"}},
{config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
{chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}},
- {couch, "couchdb-couch", {branch, "1843-feature-bigcouch"}},
+ {couch, "couchdb-couch", {branch, "master"}},
{couch_index, "couchdb-couch-index", {branch, "1843-feature-bigcouch"}},
{couch_mrview, "couchdb-couch-mrview", {branch, "1843-feature-bigcouch"}},
{couch_replicator, "couchdb-couch-replicator", {branch, "1843-feature-bigcouch"}},