Merge branch 'windsor-merge'
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/aa9f32d8 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/aa9f32d8 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/aa9f32d8 Branch: refs/heads/1963-eunit-bigcouch Commit: aa9f32d8f38b5e366e546843d1fe73bf317bb93c Parents: 73a0307 881ead7 Author: Robert Newson <rnew...@apache.org> Authored: Thu Aug 28 13:36:13 2014 +0100 Committer: Robert Newson <rnew...@apache.org> Committed: Thu Aug 28 13:36:13 2014 +0100 ---------------------------------------------------------------------- Makefile | 5 +- dev/run | 1 + rebar.config.script | 60 ++++++---- rel/files/sys.config | 19 ++- rel/overlay/etc/default.ini | 5 +- rel/reltool.config | 8 ++ share/www/script/test/config.js | 2 +- share/www/script/test/replication.js | 120 +++++++++---------- .../test/replicator_db_identical_continuous.js | 7 ++ test/etap/030-doc-from-json.t | 38 +++--- test/etap/031-doc-to-json.t | 66 +++++----- test/etap/060-kt-merging.t | 53 ++++---- test/javascript/run | 14 ++- 13 files changed, 221 insertions(+), 177 deletions(-) ----------------------------------------------------------------------
