summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2014-05-14 16:41:36 +0100
committerRobert Newson <rnewson@apache.org>2014-05-14 16:41:36 +0100
commit73873817827251eb0da3be2407c8f22cc4eb59e8 (patch)
tree68474f843086e34acfc63e01a308753f974e4631
parentc5da4ba92da061321c6ab34ef3c895928b614be3 (diff)
downloadcouchdb-73873817827251eb0da3be2407c8f22cc4eb59e8.tar.gz
ets_lru 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 33c451bf3..6b1512559 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -25,7 +25,7 @@ DepDescs = [
{couch_mrview, "couchdb-couch-mrview", {branch, "master"}},
{couch_replicator, "couchdb-couch-replicator", {branch, "master"}},
{ddoc_cache, "couchdb-ddoc-cache", {branch, "master"}},
- {ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
+ {ets_lru, "couchdb-ets-lru", {branch, "master"}},
{fabric, "couchdb-fabric", {branch, "master"}},
{ibrowse, "couchdb-ibrowse", {tag, "CouchDB-1.1.0"}},
{jiffy, "couchdb-jiffy", {branch, "master"}},