You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2017/04/12 17:28:23 UTC

[2/2] storm git commit: Merge branch '1.x-branch' of https://git-wip-us.apache.org/repos/asf/storm into 1.x-branch

Merge branch '1.x-branch' of https://git-wip-us.apache.org/repos/asf/storm into 1.x-branch


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

Branch: refs/heads/1.x-branch
Commit: d185367fb2ed134c9cc8ddd666e786d540b3a182
Parents: 1f50279 a61a828
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Apr 12 13:28:13 2017 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Apr 12 13:28:13 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.md                                    |  9 +++++++-
 README.markdown                                 |  1 +
 bin/storm-config.cmd                            | 10 +++++++++
 docs/Setting-up-a-Storm-cluster.md              | 13 ++++++------
 docs/distcache-blobstore.md                     |  4 ++--
 .../spout/trident/KafkaTridentSpoutEmitter.java | 14 +++++++++----
 pom.xml                                         |  9 ++++++++
 .../clj/org/apache/storm/daemon/executor.clj    |  6 ++++--
 storm-core/src/jvm/org/apache/storm/Config.java | 20 +++++++++---------
 .../apache/storm/localizer/AsyncLocalizer.java  |  6 +++---
 .../org/apache/storm/TestConfigValidate.java    | 22 +++++++++++++++++++-
 11 files changed, 85 insertions(+), 29 deletions(-)
----------------------------------------------------------------------