You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2012/11/12 19:33:03 UTC
[1/3] git commit: Merge git://git.apache.org/couchdb
Updated Branches:
refs/heads/430-fix-content-type-for-lists-after-get-row [created] 5b02fdbd2
Merge git://git.apache.org/couchdb
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5b02fdbd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5b02fdbd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5b02fdbd
Branch: refs/heads/430-fix-content-type-for-lists-after-get-row
Commit: 5b02fdbd2316adda39803a324a46cf182f25c65b
Parents: ac2240b b9af7ea
Author: Caleb Case <ca...@gmail.com>
Authored: Mon Nov 5 05:29:20 2012 -0500
Committer: Caleb Case <ca...@gmail.com>
Committed: Mon Nov 5 05:29:20 2012 -0500
----------------------------------------------------------------------
.gitignore | 1 +
.mailmap | 13 +
.travis.yml | 6 +-
CHANGES | 34 ++
Makefile.am | 14 +-
NEWS | 8 +
README | 6 +-
THANKS | 10 +-
etc/couchdb/Makefile.am | 7 +-
etc/couchdb/default.ini.tpl.in | 5 +
etc/init/couchdb.tpl.in | 3 +
share/server/util.js | 2 +-
share/www/database.html | 4 +-
share/www/script/couch.js | 11 +-
share/www/script/couch_test_runner.js | 1 +
share/www/script/futon.browse.js | 13 +-
share/www/script/futon.js | 30 ++
share/www/script/jquery.couch.js | 5 +-
share/www/script/test/changes.js | 144 +++++--
share/www/script/test/content_negotiation.js | 2 +-
share/www/script/test/cookie_auth.js | 22 +-
share/www/script/test/reader_acl.js | 7 +
share/www/script/test/replication.js | 1 +
share/www/script/test/replicator_db.js | 4 +
share/www/script/test/rewrite.js | 201 +++++----
share/www/script/test/update_documents.js | 15 +-
share/www/script/test/users_db.js | 10 +
share/www/script/test/uuids.js | 27 ++-
share/www/script/test/view_multi_key_all_docs.js | 4 +
share/www/script/test/view_multi_key_design.js | 4 +
share/www/script/test/view_multi_key_temp.js | 3 +
share/www/spec/run.html | 1 +
share/www/style/layout.css | 2 +
share/www/verify_install.html | 1 +
src/couch_index/src/couch_index.erl | 14 +-
src/couch_index/src/couch_index_server.erl | 2 +-
src/couch_index/src/couch_index_updater.erl | 9 +-
src/couch_mrview/src/couch_mrview_compactor.erl | 4 +-
src/couch_mrview/src/couch_mrview_index.erl | 7 +-
src/couch_mrview/src/couch_mrview_show.erl | 20 +-
src/couch_mrview/src/couch_mrview_util.erl | 8 +-
src/couch_mrview/test/01-load.t | 2 +-
src/couch_replicator/src/couch_replicator.erl | 9 +-
.../src/couch_replicator_httpc.erl | 25 +-
.../src/couch_replicator_manager.erl | 9 +-
src/couch_replicator/test/01-load.t | 2 +-
src/couchdb/couch_changes.erl | 15 +-
src/couchdb/couch_config.erl | 13 +-
src/couchdb/couch_config_writer.erl | 8 +-
src/couchdb/couch_db_update_notifier.erl | 13 +-
src/couchdb/couch_doc.erl | 2 +
src/couchdb/couch_file.erl | 14 +-
src/couchdb/couch_httpd.erl | 116 +++---
src/couchdb/couch_httpd_db.erl | 33 ++-
src/couchdb/couch_httpd_misc_handlers.erl | 16 +-
src/couchdb/couch_httpd_rewrite.erl | 20 +-
src/couchdb/couch_httpd_vhost.erl | 5 +-
src/couchdb/couch_js_functions.hrl | 6 +-
src/couchdb/couch_log.erl | 10 +-
src/couchdb/couch_passwords.erl | 25 +
src/couchdb/couch_server.erl | 23 +-
src/couchdb/couch_server_sup.erl | 14 +-
src/couchdb/couch_users_db.erl | 6 +-
src/couchdb/couch_util.erl | 42 ++
src/couchdb/couch_uuids.erl | 10 +-
src/etap/Makefile.am | 20 +-
src/etap/etap.erl | 330 +++++++++++---
src/etap/etap_application.erl | 72 ---
src/etap/etap_can.erl | 79 ----
src/etap/etap_exception.erl | 66 ---
src/etap/etap_process.erl | 42 --
src/etap/etap_report.erl | 343 ---------------
src/etap/etap_request.erl | 89 ----
src/etap/etap_string.erl | 47 --
src/etap/etap_web.erl | 65 ---
src/ibrowse/ibrowse_http_client.erl | 62 ++--
src/mochiweb/mochiweb_acceptor.erl | 7 +-
src/mochiweb/mochiweb_cookies.erl | 12 +-
src/mochiweb/mochiweb_request.erl | 25 +-
src/mochiweb/mochiweb_socket.erl | 15 +-
src/snappy/Makefile.am | 2 +-
test/etap/001-load.t | 2 +-
test/etap/020-btree-basics.t | 4 +-
test/etap/040-util.t | 4 +-
test/etap/041-uuid-gen-id.ini | 20 +
test/etap/041-uuid-gen.t | 33 ++-
test/etap/050-stream.t | 2 +-
test/etap/072-cleanup.t | 2 +-
test/etap/073-changes.t | 2 +-
test/etap/083-config-no-files.t | 2 -
test/etap/090-task-status.t | 3 -
test/etap/Makefile.am | 1 +
test/javascript/cli_runner.js | 36 ++-
test/javascript/run.tpl | 22 +-
94 files changed, 1241 insertions(+), 1291 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5b02fdbd/src/couch_mrview/src/couch_mrview_show.erl
----------------------------------------------------------------------