couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject [3/30] git commit: Merge branch 'docs', remote-tracking branch 'origin' into docs
Date Sat, 17 Nov 2012 19:52:49 GMT
Merge branch 'docs', remote-tracking branch 'origin' into docs


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/037e0488
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/037e0488
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/037e0488

Branch: refs/heads/docs
Commit: 037e0488186d090afd78847521ce355a6370e0a9
Parents: cd1f301 2774531
Author: Noah Slater <nslater@apache.org>
Authored: Sat Nov 17 15:55:23 2012 +0000
Committer: Noah Slater <nslater@apache.org>
Committed: Sat Nov 17 15:55:23 2012 +0000

----------------------------------------------------------------------
 CHANGES                                            |   19 ++++-
 NEWS                                               |    5 +-
 README                                             |    6 +-
 etc/couchdb/local.ini                              |    7 ++
 share/www/script/couch.js                          |   11 ++-
 share/www/script/couch_test_runner.js              |    1 +
 share/www/script/jquery.couch.js                   |    3 +-
 share/www/script/test/changes.js                   |   17 ++--
 share/www/script/test/content_negotiation.js       |    2 +-
 share/www/script/test/replication.js               |    1 +
 share/www/script/test/update_documents.js          |    4 +-
 share/www/script/test/users_db_security.js         |    8 ++
 share/www/spec/run.html                            |    1 +
 share/www/verify_install.html                      |    1 +
 src/couch_mrview/src/couch_mrview_index.erl        |    7 +-
 src/couch_mrview/src/couch_mrview_show.erl         |   14 +++-
 src/couch_replicator/src/couch_replicator.hrl      |    2 +-
 .../src/couch_replicator_httpc.erl                 |   29 ++++--
 .../src/couch_replicator_manager.erl               |    2 +-
 .../src/couch_replicator_utils.erl                 |    6 +
 src/couchdb/couch_auth_cache.erl                   |    2 +-
 src/couchdb/couch_config.erl                       |   11 +--
 src/couchdb/couch_config_writer.erl                |    8 +-
 src/couchdb/couch_db.erl                           |    2 +-
 src/couchdb/couch_db.hrl                           |    4 +-
 src/couchdb/couch_file.erl                         |   18 +++-
 src/couchdb/couch_httpd.erl                        |   77 +++++++++------
 src/couchdb/couch_httpd_misc_handlers.erl          |    7 ++
 src/couchdb/couch_log.erl                          |   51 ++++++++--
 src/couchdb/couch_server.erl                       |   15 +++-
 src/couchdb/couch_server_sup.erl                   |   14 ++--
 src/ejson/ejson.erl                                |    2 +
 src/etap/etap.erl                                  |   21 ++--
 src/ibrowse/ibrowse_http_client.erl                |   62 ++++++------
 test/etap/077-couch-db-fast-db-delete-create.t     |   61 ++++++++++++
 35 files changed, 360 insertions(+), 141 deletions(-)
----------------------------------------------------------------------



Mime
View raw message