Merge branch '1.2.x' of https://git-wip-us.apache.org/repos/asf/couchdb into 1.2.x
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1b02bf40 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1b02bf40 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1b02bf40 Branch: refs/heads/1.2.x Commit: 1b02bf40c5a3f7a0dda940de1dcc4310f2406c39 Parents: 15619b5 09063e9 Author: Noah Slater <[email protected]> Authored: Mon Feb 25 19:54:02 2013 +0000 Committer: Noah Slater <[email protected]> Committed: Mon Feb 25 19:54:02 2013 +0000 ---------------------------------------------------------------------- CHANGES | 3 +++ share/www/script/test/rewrite.js | 19 ++++++++++++++++++- src/couchdb/couch_db.hrl | 2 ++ src/couchdb/couch_httpd.erl | 2 ++ src/couchdb/couch_httpd_rewrite.erl | 17 +++++++---------- 5 files changed, 32 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/1b02bf40/CHANGES ----------------------------------------------------------------------
