couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couchdb commit: updated refs/heads/1843-feature-bigcouch to 694e3f3
Date Tue, 06 May 2014 17:10:45 GMT
Repository: couchdb
Updated Branches:
  refs/heads/1843-feature-bigcouch 431d9b624 -> 694e3f358


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/1843-feature-bigcouch
Commit: 694e3f35801cc2ff65fcae7bb19bea75920d1433
Parents: 431d9b6
Author: Robert Newson <rnewson@apache.org>
Authored: Tue May 6 18:10:38 2014 +0100
Committer: Robert Newson <rnewson@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"}},


Mime
View raw message