You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/07/10 16:50:46 UTC
[13/50] couchdb commit: updated refs/heads/master to 6526051
config 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/694e3f35
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/694e3f35
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/694e3f35
Branch: refs/heads/master
Commit: 694e3f35801cc2ff65fcae7bb19bea75920d1433
Parents: 431d9b6
Author: Robert Newson <rn...@apache.org>
Authored: Tue May 6 18:10:38 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue May 6 18:10:38 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/694e3f35/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 55876c5..a4865e5 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -18,7 +18,7 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
{couch_log, "couchdb-couch-log", {branch, "master"}},
- {config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
+ {config, "couchdb-config", {branch, "master"}},
{chttpd, "couchdb-chttpd", {branch, "master"}},
{couch, "couchdb-couch", {branch, "master"}},
{couch_index, "couchdb-couch-index", {branch, "1843-feature-bigcouch"}},