summaryrefslogtreecommitdiff
path: root/rebar.config.script
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2014-04-28 17:01:39 +0100
committerRobert Newson <rnewson@apache.org>2014-04-29 12:55:09 +0100
commit9a361ba62ed3aee5fd6ef11c0cc20807d6b1f3a0 (patch)
tree0e9b78833836e7509adb50ac30a1e34409ee1f0d /rebar.config.script
parent698b195657377941a1d2853628d4ab761d207d83 (diff)
downloadcouchdb-9a361ba62ed3aee5fd6ef11c0cc20807d6b1f3a0.tar.gz
couch_log is merged
Diffstat (limited to 'rebar.config.script')
-rw-r--r--rebar.config.script2
1 files changed, 1 insertions, 1 deletions
diff --git a/rebar.config.script b/rebar.config.script
index de5de3856..f828bcd6e 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -17,7 +17,7 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
- {couch_log, "couchdb-couch-log", {branch, "1843-feature-bigcouch"}},
+ {couch_log, "couchdb-couch-log", {branch, "master"}},
{chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}},
{config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
{couch, "couchdb-couch", {branch, "1843-feature-bigcouch"}},