cloudant_bigcouch.git/rel/overlay/share/www, branch debian

Merge pull request #67 from cloudant/12645-merge_latest_1.1.x

2011-10-04T20:11:12+00:00

Merge remote branch 'apache/1.1.x'

2011-10-04T16:22:45+00:00

permit . within database names to allow shard browsing on :5986

2011-09-28T21:49:32+00:00

handle bigcouch sequences in futon.browse.js

2011-09-28T21:15:21+00:00

Merge 1.1.x because Paul Davis kept his important bug fix super secret while I was slaving away on this merge for two days.

2011-09-28T20:20:19+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

include new share/www files missed in the 1.1 merge.

2011-08-13T01:28:27+00:00

Merge CouchDB 1.1

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

Move new attachment_conflicts test to the overlay

2011-02-14T04:01:17+00:00

COUCHDB-1047 - support inclusive_end with reduce calls

2011-01-28T21:14:16+00:00

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1064800 13f79535-47bb-0310-9956-ffa450edef68