Merge branch 'STORM-756-v2-retry-1' of https://github.com/HeartSaVioR/storm into storm-756-remerge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/79a2a2a5 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/79a2a2a5 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/79a2a2a5 Branch: refs/heads/master Commit: 79a2a2a58888ca5c7dad379e7316aacfe2c465aa Parents: 19b8b7d f989081 Author: Derek Dagit <[email protected]> Authored: Fri Dec 4 16:33:09 2015 -0600 Committer: Derek Dagit <[email protected]> Committed: Fri Dec 4 16:33:09 2015 -0600 ---------------------------------------------------------------------- CHANGELOG.md | 1 + conf/defaults.yaml | 1 + storm-core/src/jvm/backtype/storm/Config.java | 1 + .../src/jvm/backtype/storm/task/ShellBolt.java | 13 +- .../storm/utils/ShellBoltMessageQueue.java | 121 +++++++++++++++++++ .../test/clj/backtype/storm/multilang_test.clj | 2 +- .../storm/utils/ShellBoltMessageQueueTest.java | 85 +++++++++++++ 7 files changed, 216 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/79a2a2a5/CHANGELOG.md ---------------------------------------------------------------------- diff --cc CHANGELOG.md index 2185747,6684d7e..5254cbb --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -1,6 -1,6 +1,7 @@@ ## 0.11.0 + * STORM-876: Blobstore/DistCache Support * STORM-1361: Apache License missing from two Cassandra files + * STORM-756: Handle taskids response as soon as possible * STORM-1218: Use markdown for JavaDoc. * STORM-1075: Storm Cassandra connector. * STORM-965: excessive logging in storm when non-kerberos client tries to connect http://git-wip-us.apache.org/repos/asf/storm/blob/79a2a2a5/conf/defaults.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/79a2a2a5/storm-core/src/jvm/backtype/storm/Config.java ----------------------------------------------------------------------
