[23/50] couchdb commit: updated refs/heads/master to 6526051

[rn...@apache.org]

ets_lru 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/73873817
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/73873817
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/73873817

Branch: refs/heads/master
Commit: 73873817827251eb0da3be2407c8f22cc4eb59e8
Parents: c5da4ba
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 16:41:36 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 16:41:36 2014 +0100

----------------------------------------------------------------------
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/73873817/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 33c451b..6b15125 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"}},