couch commit: updated refs/heads/master to e7e5cc8

[kx...@apache.org]

Repository: couchdb-couch
Updated Branches:
  refs/heads/master 269faca76 -> e7e5cc84c


Fix OS Daemons test dependency.

In isolation was failing in configuration_reader_test_
Because fixtures/os_daemon_configer.escript was
requesting uuids.algorithm from config application,
which was not set up.

COUCHDB-2831


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

Branch: refs/heads/master
Commit: e7e5cc84c13f7d2031dd5cb661745590b8efbef6
Parents: 269faca
Author: Nick Vatamaniuc <va...@gmail.com>
Authored: Wed Sep 30 10:37:20 2015 -0400
Committer: Nick Vatamaniuc <va...@gmail.com>
Committed: Wed Sep 30 11:04:00 2015 -0400

----------------------------------------------------------------------
 test/couchdb_os_daemons_tests.erl | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e7e5cc84/test/couchdb_os_daemons_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb_os_daemons_tests.erl b/test/couchdb_os_daemons_tests.erl
index 7ec70a9..a2f8cfe 100644
--- a/test/couchdb_os_daemons_tests.erl
+++ b/test/couchdb_os_daemons_tests.erl
@@ -41,6 +41,9 @@ setup(DName) ->
     {ok, OsDPid} = couch_os_daemons:start_link(),
     config:set("os_daemons", DName,
                      filename:join([?FIXTURESDIR, DName]), false),
+    % Set configuration option to be used by configuration_reader_test_
+    % This will be used in os_daemon_configer.escript:test_get_cfg2
+    config:set("uuids", "algorithm","sequential", false),
     timer:sleep(?DELAY),  % sleep a bit to let daemon set kill flag
     {Ctx, OsDPid}.