You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2010/08/11 00:00:18 UTC
svn commit: r984230 - in /couchdb/branches/1.0.x: ./ etc/default/couchdb
share/Makefile.am
Author: nslater
Date: Tue Aug 10 22:00:17 2010
New Revision: 984230
URL: http://svn.apache.org/viewvc?rev=984230&view=rev
Log:
backported r984228
Modified:
couchdb/branches/1.0.x/ (props changed)
couchdb/branches/1.0.x/etc/default/couchdb (props changed)
couchdb/branches/1.0.x/share/Makefile.am
Propchange: couchdb/branches/1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 22:00:17 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:984170,984178,984214
+/couchdb/trunk:984170,984178,984214,984228
Propchange: couchdb/branches/1.0.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 22:00:17 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:984170,984178,984214
+/couchdb/trunk/etc/default/couchdb:984170,984178,984214,984228
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/1.0.x/share/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/share/Makefile.am?rev=984230&r1=984229&r2=984230&view=diff
==============================================================================
--- couchdb/branches/1.0.x/share/Makefile.am (original)
+++ couchdb/branches/1.0.x/share/Makefile.am Tue Aug 10 22:00:17 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/base64.js \
@@ -175,6 +179,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