Merge branch 'refs/heads/2200-feature-support-erlang-17.0' - closes COUCHDB-2200 * refs/heads/2200-feature-support-erlang-17.0: docs: update supported Erlang/OTP and SpiderMonkey versions build: detect new erlang version format correctly Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/296de8b1 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/296de8b1 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/296de8b1 Branch: refs/heads/Update-Sidebar-Ui Commit: 296de8b1fe69e66d649294fd0445449b18c49194 Parents: a8ddf6c 9137564 Author: Dave Cottlehuber Authored: Thu May 1 15:46:42 2014 +0200 Committer: Dave Cottlehuber Committed: Thu May 1 15:46:58 2014 +0200 ---------------------------------------------------------------------- .travis.yml | 5 +++-- INSTALL.Unix | 4 ++-- configure.ac | 18 +++++++++------ share/doc/build/Makefile.am | 3 +++ share/doc/src/install/unix.rst | 4 ++-- share/doc/src/whatsnew/1.7.rst | 42 +++++++++++++++++++++++++++++++++++ share/doc/src/whatsnew/index.rst | 1 + 7 files changed, 64 insertions(+), 13 deletions(-) ----------------------------------------------------------------------