cloudant_bigcouch.git/apps/couch/test/etap/020-btree-basics.t, branch debian

Merge 1.1.x changes

2011-09-28T10:32:50+00:00

Conflicts:
	apps/couch/include/couch_db.hrl
	apps/couch/src/couch_db.erl
	apps/couch/src/couch_os_process.erl
	apps/couch/src/couch_query_servers.erl
	apps/couch/src/couch_rep.erl
	apps/couch/src/couch_replication_manager.erl
	apps/couch/src/couch_view_compactor.erl
	apps/couch/src/couch_view_group.erl
	apps/couch/src/couch_view_updater.erl
	configure.ac
	couchjs/c_src/http.c
	couchjs/c_src/main.c
	couchjs/c_src/utf8.c
	etc/windows/couchdb.iss.tpl
	src/couchdb/priv/Makefile.am
	src/couchdb/priv/couch_js/main.c
	test/etap/160-vhosts.t
	test/etap/200-view-group-no-db-leaks.t
	test/etap/Makefile.am

BugzID: 12645

Revert "Add support for inclusive_end to fold_reduce, BugzID 11069"

2011-01-28T21:12:00+00:00

This reverts commit 5c3161d57b1d2d7953497c24be09112b6bcf71b6.

Add support for inclusive_end to fold_reduce, BugzID 11069

2010-12-09T19:54:03+00:00

Cloudant changes to etap tests

2010-08-19T21:51:06+00:00

clear out root folder a bit, moving couch bits into apps/couch or rel/

2010-08-18T21:19:37+00:00