couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r984180 - in /couchdb/branches/0.11.x: ./ configure.ac etc/Makefile.am etc/default/couchdb etc/windows/ etc/windows/Makefile.am license.skip
Date Tue, 10 Aug 2010 19:35:44 GMT
Author: nslater
Date: Tue Aug 10 19:35:44 2010
New Revision: 984180

URL: http://svn.apache.org/viewvc?rev=984180&view=rev
Log:
backported r984178

Added:
    couchdb/branches/0.11.x/etc/windows/Makefile.am
      - copied unchanged from r984178, couchdb/trunk/etc/windows/Makefile.am
Modified:
    couchdb/branches/0.11.x/   (props changed)
    couchdb/branches/0.11.x/configure.ac
    couchdb/branches/0.11.x/etc/Makefile.am
    couchdb/branches/0.11.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.11.x/etc/windows/   (props changed)
    couchdb/branches/0.11.x/license.skip

Propchange: couchdb/branches/0.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 19:35:44 2010
@@ -6,4 +6,4 @@
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
 /couchdb/tags/0.10.0:825400
-/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170
+/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178

Modified: couchdb/branches/0.11.x/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/configure.ac?rev=984180&r1=984179&r2=984180&view=diff
==============================================================================
--- couchdb/branches/0.11.x/configure.ac (original)
+++ couchdb/branches/0.11.x/configure.ac Tue Aug 10 19:35:44 2010
@@ -391,6 +391,7 @@ AC_CONFIG_FILES([etc/launchd/org.apache.
 AC_CONFIG_FILES([etc/launchd/Makefile])
 AC_CONFIG_FILES([etc/logrotate.d/couchdb.tpl])
 AC_CONFIG_FILES([etc/logrotate.d/Makefile])
+AC_CONFIG_FILES([etc/windows/Makefile])
 AC_CONFIG_FILES([etc/Makefile])
 AC_CONFIG_FILES([share/Makefile])
 AC_CONFIG_FILES([src/Makefile])

Modified: couchdb/branches/0.11.x/etc/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/etc/Makefile.am?rev=984180&r1=984179&r2=984180&view=diff
==============================================================================
--- couchdb/branches/0.11.x/etc/Makefile.am (original)
+++ couchdb/branches/0.11.x/etc/Makefile.am Tue Aug 10 19:35:44 2010
@@ -10,7 +10,7 @@
 ## License for the specific language governing permissions and limitations under
 ## the License.
 
-SUBDIRS = couchdb default init launchd logrotate.d
+SUBDIRS = couchdb default init launchd logrotate.d windows
 
 default_sysconf_data = logrotate.d/couchdb
 

Propchange: couchdb/branches/0.11.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 19:35:44 2010
@@ -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:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170
+/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Propchange: couchdb/branches/0.11.x/etc/windows/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Aug 10 19:35:44 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Modified: couchdb/branches/0.11.x/license.skip
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/license.skip?rev=984180&r1=984179&r2=984180&view=diff
==============================================================================
--- couchdb/branches/0.11.x/license.skip (original)
+++ couchdb/branches/0.11.x/license.skip Tue Aug 10 19:35:44 2010
@@ -49,6 +49,7 @@
 ^etc/logrotate.d/Makefile
 ^etc/logrotate.d/Makefile.in
 ^etc/logrotate.d/couchdb*
+^etc/windows/Makefile
 ^etc/windows/README.txt.tpl
 ^libtool
 ^license.skip



Mime
View raw message