You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@storm.apache.org by go...@apache.org on 2019/07/01 17:41:22 UTC

[storm] 02/02: Merge branch 'STORM-3407'

This is an automated email from the ASF dual-hosted git repository.

govind pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git

commit 4568fb47d7bbce9d4c1194bd0a925bfa0b16d9ad
Merge: 5d582b4 4ec0180
Author: Govind Menon <go...@gmail.com>
AuthorDate: Mon Jul 1 12:40:51 2019 -0500

    Merge branch 'STORM-3407'

 conf/defaults.yaml                                 |  2 ++
 storm-client/src/jvm/org/apache/storm/Config.java  |  7 +++++
 .../main/java/org/apache/storm/DaemonConfig.java   |  7 +++++
 .../scheduling/ConstraintSolverStrategy.java       | 31 +++++++++++++++-------
 .../scheduling/TestConstraintSolverStrategy.java   |  2 ++
 5 files changed, 39 insertions(+), 10 deletions(-)