Commit Damien's rep_security branch to trunk.

Changes bulk_docs conflict checking. 
Breaks file format, see mailing list for data upgrade procedure, or
http://wiki.apache.org/couchdb/Breaking_changes


git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@753448 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/share/www/script/test/reduce.js b/share/www/script/test/reduce.js
index d3245f98..c8bdcd92 100644
--- a/share/www/script/test/reduce.js
+++ b/share/www/script/test/reduce.js
@@ -17,7 +17,7 @@ couchTests.reduce = function(debug) {
   if (debug) debugger;
   var numDocs = 500
   var docs = makeDocs(1,numDocs + 1);
-  T(db.bulkSave(docs).ok);
+  db.bulkSave(docs);
   var summate = function(N) {return (N+1)*N/2;};
 
   var map = function (doc) {
@@ -65,7 +65,7 @@ couchTests.reduce = function(debug) {
       docs.push({keys:["d", "a"]});
       docs.push({keys:["d", "b"]});
       docs.push({keys:["d", "c"]});
-      T(db.bulkSave(docs).ok);
+      db.bulkSave(docs);
       T(db.info().doc_count == ((i - 1) * 10 * 11) + ((j + 1) * 11));
     }
 
@@ -157,7 +157,7 @@ couchTests.reduce = function(debug) {
     docs.push({val:80});
     docs.push({val:90});
     docs.push({val:100});
-    T(db.bulkSave(docs).ok);
+    db.bulkSave(docs);
   }
   
   var results = db.query(map, reduceCombine);