couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couchdb commit: updated refs/heads/master to bdc9681
Date Sun, 20 Dec 2015 18:41:07 GMT
Repository: couchdb
Updated Branches:
  refs/heads/master 2977863f4 -> bdc9681fd


fix conflict case - COUCHDB-2082


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

Branch: refs/heads/master
Commit: bdc9681fd6042612fe77f122228a667813673ffd
Parents: 2977863
Author: Robert Newson <rnewson@apache.org>
Authored: Sun Dec 20 18:40:27 2015 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Sun Dec 20 18:40:52 2015 +0000

----------------------------------------------------------------------
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/bdc9681f/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 668c004..324957e 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,7 +30,7 @@ DepDescs = [
 {couch_log,        "couch-log",        "939b3a7bda7dcb03f841b899762b188ca31bc230"},
 {couch_log_lager,  "couch-log-lager",  "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"},
 {config,           "config",           "84197a6f1c5cb43447239df1fe57b4312b0c03c4"},
-{chttpd,           "chttpd",           "3ff69bffd45cda6b256bf73cbf7799798c0b4917"},
+{chttpd,           "chttpd",           "d31b2a4d44d68f8e9a1ac2c55c47e0cf4e95397b"},
 {couch,            "couch",            "57ecc0427c465156b0b10111737f32ae2242391e"},
 {couch_index,      "couch-index",      "14f579dcd142ee90300244c854b301bbd5c863ee"},
 {couch_mrview,     "couch-mrview",     "c3bed460ee844175b8ce11081386be27f686d8ff"},


Mime
View raw message