summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2014-05-14 16:15:25 +0100
committerRobert Newson <rnewson@apache.org>2014-05-14 16:15:25 +0100
commit7bd5a7687969086133277aa3f57ebf54d9c10bc4 (patch)
tree195a1e4fea0983705c545eb76ec1797d6a772705
parent105a99a048d2b70768582983a404ba810fd714b9 (diff)
downloadcouchdb-7bd5a7687969086133277aa3f57ebf54d9c10bc4.tar.gz
ddoc_cache did not need merging
-rw-r--r--rebar.config.script2
1 files changed, 1 insertions, 1 deletions
diff --git a/rebar.config.script b/rebar.config.script
index 120dad2cb..b3f29aef8 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"}},