Merge remote-tracking branch 'adrienverge/COUCHDB-3119'
authorJan Lehnardt <jan@apache.org>
Sat, 3 Jun 2017 09:46:34 +0000 (11:46 +0200)
committerJan Lehnardt <jan@apache.org>
Sat, 3 Jun 2017 09:46:34 +0000 (11:46 +0200)
commitb2b93c17754cb4169bf9e922d9be702eb6d0f0d5
tree5dfb8db97b91a397903cb0bf5c17258252c32bd2
parent2590fbcc0ecbe854404edae751514d1fd20b07e4
parentd75693ea94de8595b69fcf8e9eb189664e115574
Merge remote-tracking branch 'adrienverge/COUCHDB-3119'

* adrienverge/COUCHDB-3119:
  add_node: Don't fail if node name != "couchdb" or "node1"
README.md
src/setup.erl
src/setup_httpd.erl
test/t-frontend-setup.sh
test/t.sh