ddoc_cache 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/7bd5a768
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7bd5a768
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7bd5a768
Branch: refs/heads/master
Commit: 7bd5a7687969086133277aa3f57ebf54d9c10bc4
Parents: 105a99a
Author: Robert Newson <rnewson@apache.org>
Authored: Wed May 14 16:15:25 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Wed May 14 16:15:25 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7bd5a768/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 120dad2..b3f29ae 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -24,7 +24,7 @@ DepDescs = [
{couch_index, "couchdb-couch-index", {branch, "master"}},
{couch_mrview, "couchdb-couch-mrview", {branch, "master"}},
{couch_replicator, "couchdb-couch-replicator", {branch, "master"}},
- {ddoc_cache, "couchdb-ddoc-cache", {branch, "1843-feature-bigcouch"}},
+ {ddoc_cache, "couchdb-ddoc-cache", {branch, "master"}},
{ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
{fabric, "couchdb-fabric", {branch, "master"}},
{ibrowse, "couchdb-ibrowse", {tag, "CouchDB-1.1.0"}},
|