couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1095582 - in /couchdb/branches/1.1.x: ./ etc/default/couchdb test/etap/test_util.erl.in
Date Thu, 21 Apr 2011 01:03:49 GMT
Author: davisp
Date: Thu Apr 21 01:03:48 2011
New Revision: 1095582

URL: http://svn.apache.org/viewvc?rev=1095582&view=rev
Log:
Make local_dev.ini the last file in the config chain.

Backport of 1095581 from trunk.


Modified:
    couchdb/branches/1.1.x/   (props changed)
    couchdb/branches/1.1.x/etc/default/couchdb   (props changed)
    couchdb/branches/1.1.x/test/etap/test_util.erl.in

Propchange: couchdb/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 21 01:03:48 2011
@@ -6,4 +6,4 @@
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
 /couchdb/tags/0.10.0:825400
-/couchdb/trunk:1045203,1064417,1081107-1083320,1095523,1095557,1095569
+/couchdb/trunk:1045203,1064417,1081107-1083320,1095523,1095557,1095569,1095581

Propchange: couchdb/branches/1.1.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 21 01:03:48 2011
@@ -6,5 +6,5 @@
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
 /couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:1045203,1064417,1081107-1083320,1095523,1095557,1095569
+/couchdb/trunk/etc/default/couchdb:1045203,1064417,1081107-1083320,1095523,1095557,1095569,1095581
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/1.1.x/test/etap/test_util.erl.in
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/test/etap/test_util.erl.in?rev=1095582&r1=1095581&r2=1095582&view=diff
==============================================================================
--- couchdb/branches/1.1.x/test/etap/test_util.erl.in (original)
+++ couchdb/branches/1.1.x/test/etap/test_util.erl.in Thu Apr 21 01:03:48 2011
@@ -36,7 +36,7 @@ build_file(Name) ->
 config_files() ->
     [
         build_file("etc/couchdb/default_dev.ini"),
-        build_file("etc/couchdb/local_dev.ini"),
-        source_file("test/etap/random_port.ini")
+        source_file("test/etap/random_port.ini"),
+        build_file("etc/couchdb/local_dev.ini")
     ].
 



Mime
View raw message