Heya Dave, can you also commit this to the 1.x.x branch, so this is in a hypothetical 1.7.0 release?
Thanks! Jan -- > On 26 Jun 2015, at 13:52, [email protected] wrote: > > Repository: couchdb > Updated Branches: > refs/heads/1.6.x 46f7b4e7e -> 95cb436be > > > build: support OTP-18.0 > > > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo > Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/95cb436b > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/95cb436b > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/95cb436b > > Branch: refs/heads/1.6.x > Commit: 95cb436be30305efa091809813b64ef31af968c8 > Parents: 46f7b4e > Author: Dave Cottlehuber <[email protected]> > Authored: Fri Jun 26 10:31:27 2015 +0200 > Committer: Dave Cottlehuber <[email protected]> > Committed: Fri Jun 26 12:01:26 2015 +0200 > > ---------------------------------------------------------------------- > INSTALL.Unix | 2 +- > INSTALL.Windows | 2 +- > configure.ac | 8 ++++---- > share/doc/src/install/unix.rst | 2 +- > share/doc/src/install/windows.rst | 2 +- > 5 files changed, 8 insertions(+), 8 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/couchdb/blob/95cb436b/INSTALL.Unix > ---------------------------------------------------------------------- > diff --git a/INSTALL.Unix b/INSTALL.Unix > index f66f98c..4c63bc8 100644 > --- a/INSTALL.Unix > +++ b/INSTALL.Unix > @@ -39,7 +39,7 @@ Dependencies > > You should have the following installed: > > - * Erlang OTP (>=R14B01, =<R17) (http://erlang.org/) > + * Erlang OTP (>=R14B01, =<R18) (http://erlang.org/) > * ICU (http://icu-project.org/) > * OpenSSL (http://www.openssl.org/) > * Mozilla SpiderMonkey (1.8.5) (http://www.mozilla.org/js/spidermonkey/) > > http://git-wip-us.apache.org/repos/asf/couchdb/blob/95cb436b/INSTALL.Windows > ---------------------------------------------------------------------- > diff --git a/INSTALL.Windows b/INSTALL.Windows > index 29c69b0..1ca04fd 100644 > --- a/INSTALL.Windows > +++ b/INSTALL.Windows > @@ -29,7 +29,7 @@ Dependencies > > You will need the following installed: > > - * Erlang OTP (>=14B01, <R17) (http://erlang.org/) > + * Erlang OTP (>=14B01, <R18) (http://erlang.org/) > * ICU (>=4.*) (http://icu-project.org/) > * OpenSSL (>=0.9.8r) (http://www.openssl.org/) > * Mozilla SpiderMonkey (=1.8.5) (http://www.mozilla.org/js/spidermonkey/) > > http://git-wip-us.apache.org/repos/asf/couchdb/blob/95cb436b/configure.ac > ---------------------------------------------------------------------- > diff --git a/configure.ac b/configure.ac > index 103f029..bf9ffc4 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -411,7 +411,7 @@ esac > > { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version > compatibility" >&5 > $as_echo_n "checking Erlang version compatibility... " >&6; } > -erlang_version_error="The installed Erlang version must be >= R14B > (erts-5.8.1) and =< 17 (erts-6.0)" > +erlang_version_error="The installed Erlang version must be >= R14B > (erts-5.8.1) and =< 18 (erts-7.0)" > > version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0" > major_version=`echo $version | ${AWK} "{print \\$1}"` > @@ -419,7 +419,7 @@ minor_version=`echo $version | ${AWK} "{print \\$2}"` > patch_version=`echo $version | ${AWK} "{print \\$3}"` > echo -n "detected Erlang version: > $major_version.$minor_version.$patch_version..." > > -if test $major_version -lt 5 -o $major_version -gt 6; then > +if test $major_version -lt 5 -o $major_version -gt 7; then > as_fn_error $? "$erlang_version_error major_version does not match" > "$LINENO" 5 > fi > > @@ -438,9 +438,9 @@ otp_release="`\ > AC_SUBST(otp_release) > > AM_CONDITIONAL([USE_OTP_NIFS], > - [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)")]) > + [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)")]) > AM_CONDITIONAL([USE_EJSON_COMPARE_NIF], > - [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)")]) > + [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)")]) > > has_crypto=`\ > ${ERL} -eval "\ > > http://git-wip-us.apache.org/repos/asf/couchdb/blob/95cb436b/share/doc/src/install/unix.rst > ---------------------------------------------------------------------- > diff --git a/share/doc/src/install/unix.rst b/share/doc/src/install/unix.rst > index 76fe922..904c128 100644 > --- a/share/doc/src/install/unix.rst > +++ b/share/doc/src/install/unix.rst > @@ -52,7 +52,7 @@ Dependencies > > You should have the following installed: > > -* `Erlang OTP (>=R14B01, =<R17) <http://erlang.org/>`_ > +* `Erlang OTP (>=R14B01, =<R18) <http://erlang.org/>`_ > * `ICU <http://icu-project.org/>`_ > * `OpenSSL <http://www.openssl.org/>`_ > * `Mozilla SpiderMonkey (1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_ > > http://git-wip-us.apache.org/repos/asf/couchdb/blob/95cb436b/share/doc/src/install/windows.rst > ---------------------------------------------------------------------- > diff --git a/share/doc/src/install/windows.rst > b/share/doc/src/install/windows.rst > index b7b66af..494ef65 100644 > --- a/share/doc/src/install/windows.rst > +++ b/share/doc/src/install/windows.rst > @@ -90,7 +90,7 @@ Dependencies > > You should have the following installed: > > -* `Erlang OTP (>=14B01, <R17) <http://erlang.org/>`_ > +* `Erlang OTP (>=14B01, <R18) <http://erlang.org/>`_ > * `ICU (>=4.*) <http://icu-project.org/>`_ > * `OpenSSL (>0.9.8r) <http://www.openssl.org/>`_ > * `Mozilla SpiderMonkey (=1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_ > -- Professional Support for Apache CouchDB: http://www.neighbourhood.ie/couchdb-support/
