couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r984231 - in /couchdb/branches/0.11.x: ./ etc/default/couchdb share/Makefile.am
Date Tue, 10 Aug 2010 22:00:40 GMT
Author: nslater
Date: Tue Aug 10 22:00:40 2010
New Revision: 984231

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

Modified:
    couchdb/branches/0.11.x/   (props changed)
    couchdb/branches/0.11.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.11.x/share/Makefile.am

Propchange: couchdb/branches/0.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 22:00:40 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,984178,984214
+/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,984214,984228

Propchange: couchdb/branches/0.11.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 22:00:40 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,984178,984214
+/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,984214,984228
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.11.x/share/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/Makefile.am?rev=984231&r1=984230&r2=984231&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/Makefile.am (original)
+++ couchdb/branches/0.11.x/share/Makefile.am Tue Aug 10 22:00:40 2010
@@ -104,6 +104,10 @@ nobase_dist_localdata_DATA = \
     www/script/jquery.resizer.js \
     www/script/jquery.suggest.js \
     www/script/json2.js \
+    www/script/jspec/jspec.css \
+    www/script/jspec/jspec.jquery.js \
+    www/script/jspec/jspec.js \
+    www/script/jspec/jspec.xhr.js \
     www/script/oauth.js \
     www/script/sha1.js \
     www/script/test/all_docs.js \
@@ -171,6 +175,16 @@ nobase_dist_localdata_DATA = \
     www/script/test/view_pagination.js \
     www/script/test/view_sandboxing.js \
     www/script/test/view_xml.js \
+    www/spec/couch_js_class_methods_spec.js \
+    www/spec/couch_js_instance_methods_1_spec.js \
+    www/spec/couch_js_instance_methods_2_spec.js \
+    www/spec/couch_js_instance_methods_3_spec.js \
+    www/spec/custom_helpers.js \
+    www/spec/jquery_couch_js_class_methods_spec.js \
+    www/spec/jquery_couch_js_instance_methods_1_spec.js \
+    www/spec/jquery_couch_js_instance_methods_2_spec.js \
+    www/spec/jquery_couch_js_instance_methods_3_spec.js \
+    www/spec/run.html \
     www/status.html \
     www/style/layout.css \
     www/_sidebar.html



Mime
View raw message