Merge remote branch 'cloudant:2384-specify_config_file_in_args'

This closes #426

Signed-off-by: ILYA Khlopotov <iil...@ca.ibm.com>


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

Branch: refs/heads/master
Commit: 9f0d22fc5b38032a6de15d4f47f5e14bd7b58d6c
Parents: aa0c08c 9be42f6
Author: ILYA Khlopotov <iil...@ca.ibm.com>
Authored: Mon Jun 27 16:22:40 2016 -0700
Committer: ILYA Khlopotov <iil...@ca.ibm.com>
Committed: Mon Jun 27 16:22:40 2016 -0700

----------------------------------------------------------------------
 rel/overlay/bin/couchdb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to