Merge remote branch 'github/pr/138'

    This closes #138

    Signed-off-by: ILYA Khlopotov <iil...@ca.ibm.com>


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

Branch: refs/heads/master
Commit: 40adf248cfed83cc13c0f8fd4ba64a53ca9328ee
Parents: f2457f3 7cf698e
Author: ILYA Khlopotov <iil...@ca.ibm.com>
Authored: Thu Mar 3 12:03:01 2016 -0800
Committer: ILYA Khlopotov <iil...@ca.ibm.com>
Committed: Thu Mar 3 12:03:01 2016 -0800

----------------------------------------------------------------------
 src/couch_httpd.erl         |  44 +++--
 src/couch_httpd_cors.erl    | 356 ---------------------------------------
 test/couchdb_cors_tests.erl |  29 +++-
 3 files changed, 47 insertions(+), 382 deletions(-)
----------------------------------------------------------------------


Reply via email to