summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorILYA Khlopotov <iilyak@ca.ibm.com>2016-03-22 07:12:06 -0700
committerILYA Khlopotov <iilyak@ca.ibm.com>2016-03-22 07:12:06 -0700
commit479aa2d85b6037e3ccb5f3f0a289f7e0b7dd10f5 (patch)
tree32efb9a0cb42e2d9adf6d1c5c8ae4ba983a26bca
parent3f7a26c390aaa6498c6f12b22675f6858a5762a9 (diff)
parentf2ffe13256556e8816413fe43e8b4195dfad2706 (diff)
downloadcouchdb-479aa2d85b6037e3ccb5f3f0a289f7e0b7dd10f5.tar.gz
Merge remote branch 'github/pr/396'
This closes #396 Signed-off-by: ILYA Khlopotov <iilyak@ca.ibm.com>
-rw-r--r--rebar.config.script5
1 files changed, 3 insertions, 2 deletions
diff --git a/rebar.config.script b/rebar.config.script
index fa6a0265e..3badecdee 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,8 +30,8 @@ DepDescs = [
{cassim, "cassim", "ab1ef1cee5f7b7ec1733e44845c1df99fc7a66a3"},
{couch_log, "couch-log", "e4abbd3874356dc7a201b09676e27ff7dc8bed7c"},
{couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
-{chttpd, "chttpd", "ab299ebfcb833a819ccc9ddff3a2074ee25e0523"},
-{couch, "couch", "07ba2c0350375dc03b7eb266ed3040887bc9b320"},
+{chttpd, "chttpd", "cefabd0ece7db0e1cf4bf4abe7214d226340280a"},
+{couch, "couch", "5fa90987132c275b30183f48f02e347c648cfc28"},
{couch_index, "couch-index", "e8c8ca8b0bb66193f1ba7e4b1d7e4a3817d661ab"},
{couch_mrview, "couch-mrview", "6ec35971ebd96133cc6a34fa29f1d364049a7ecd"},
{couch_replicator, "couch-replicator", "197950631b8a73a8c36b744fc9eb00debc15ac03"},
@@ -39,6 +39,7 @@ DepDescs = [
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
{couch_peruser, "peruser", "ff7d190970a46722137fbc7a1a75466e8a544ae1"},
+{couch_tests, "erlang-tests", "cba29c894aace569f13e6bf83bc6ef06fd448712"},
{docs, "documentation", "089f404d26374d8c6942a725d05627d6901a9330", [raw]},
{ddoc_cache, "ddoc-cache", "c762e90a33ce3cda19ef142dd1120f1087ecd876"},
{ets_lru, "ets-lru", "c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},