cloudant_bigcouch.git/apps/couch/NEWS, branch master

Merge commit '1.1.1' into 0.4.x

2011-10-31T18:54:51+00:00

Conflicts:
	acinclude.m4.in
	configure.ac
	couchjs/c_src/http.c
	src/erlang-oauth/Makefile.am
	src/erlang-oauth/oauth.app.in
	src/erlang-oauth/oauth_hmac_sha1.erl
	src/erlang-oauth/oauth_http.erl
	src/erlang-oauth/oauth_plaintext.erl
	src/etap/etap_web.erl

Merge remote-tracking branch 'apache/1.1.x'

2011-10-10T18:04:54+00:00

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

Merge CouchDB 1.1

2011-06-13T13:59:55+00:00

Merge CouchDB 1.0.2 release candidate

2011-01-20T18:05:41+00:00

Conflicts:
	Makefile.am
	acinclude.m4.in
	apps/couch/src/couch_db.erl
	apps/couch/src/couch_db_updater.erl
	apps/couch/src/couch_rep.erl
	apps/couch/src/couch_rep_reader.erl
	apps/couch/src/couch_view.erl
	apps/couch/src/couch_view_group.erl
	rel/overlay/etc/default.ini
	share/Makefile.am
	src/couchdb/couch_query_servers.erl
	src/ibrowse/Makefile.am
	src/ibrowse/ibrowse.app.in
	src/ibrowse/ibrowse.erl
	src/ibrowse/ibrowse_app.erl
	src/ibrowse/ibrowse_http_client.erl
	src/ibrowse/ibrowse_lb.erl
	src/ibrowse/ibrowse_lib.erl
	src/ibrowse/ibrowse_sup.erl
	src/ibrowse/ibrowse_test.erl
	src/mochiweb/mochijson2.erl
	test/etap/112-replication-missing-revs.t
	test/etap/113-replication-attachment-comp.t
	test/etap/140-attachment-comp.t

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

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