diff options
| author | Joan Touzet <wohali@apache.org> | 2015-07-11 19:34:19 -0400 |
|---|---|---|
| committer | Joan Touzet <wohali@apache.org> | 2015-07-11 19:34:19 -0400 |
| commit | 8059f09dc0fedfdd0821b860448b52cb23038e29 (patch) | |
| tree | 85057ad4bba17d4ac68804d7409fa6bbd5ffa452 | |
| parent | a0c771cc41157004d7516f0b5495436c238106ef (diff) | |
| parent | 51b98a4a0ce0ed4a362cd7d596589733c58c2a0e (diff) | |
| download | couchdb-8059f09dc0fedfdd0821b860448b52cb23038e29.tar.gz | |
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/couchdb
| -rwxr-xr-x | dev/run | 2 | ||||
| -rw-r--r-- | rebar.config.script | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -438,7 +438,7 @@ def create_system_databases(host, port): conn = httpclient.HTTPConnection(host, port) conn.request('PUT', '/' + dbname) resp = conn.getresponse() - assert resp.status == 201, resp.read() + assert resp.status in (201, 202), resp.read() @log('Developers cluster is set up at http://127.0.0.1:{lead_port}.\n' diff --git a/rebar.config.script b/rebar.config.script index 9e451e2fe..374425cd2 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -68,7 +68,7 @@ MakeDep = fun end, AddConfig = [ - {require_otp_vsn, "R14B01|R14B03|R14B04|R16B02|R16B03-1|17"}, + {require_otp_vsn, "R14B01|R14B03|R14B04|R16B02|R16B03-1|17|18"}, {deps_dir, "src"}, {deps, lists:map(MakeDep, DepDescs)}, {sub_dirs, ["rel"]}, |