You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/07/21 18:47:29 UTC
[3/3] git commit: Merge branch 'master' of
https://github.com/icksa/incubator-storm into STORM-402
Merge branch 'master' of https://github.com/icksa/incubator-storm into STORM-402
STORM-402: FileNotFoundException when using storm with apache tika
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/5b425e41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/5b425e41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/5b425e41
Branch: refs/heads/master
Commit: 5b425e41bae2f455cae2c365ed617d5ac833847b
Parents: c1aed00 f019eff
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon Jul 21 11:41:43 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon Jul 21 11:41:43 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 10 +++++++---
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/5b425e41/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index 1e9a7e6,7c6a7a4..661283f
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -15,13 -15,6 +15,14 @@@
* STORM-367: Storm UI REST api documentation.
* STORM-200: Proposal for Multilang's Metrics feature
* STORM-351: multilang python process fall into endless loop
+ * STORM-375: Smarter downloading of assignments by supervisors and workers
+ * STORM-328: More restrictive Config checks, strict range check within Utils.getInt()
+ * STORM-381: Replace broken jquery.tablesorter.min.js to latest
+ * STORM-312: add storm monitor tools to monitor throughtput interactively
+ * STORM-354: Testing: allow users to pass TEST-TIMEOUT-MS as param for complete-topology
+ * STORM-254: one Spout/Bolt can register metric twice with same name in different timeBucket
+ * STORM-403: heartbeats-to-nimbus in supervisor-test failed due to uninten...
++ * STORM-402: FileNotFoundException when using storm with apache tika
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/5b425e41/README.markdown
----------------------------------------------------------------------
diff --cc README.markdown
index c495c19,f026e6d..8a7afc3
--- a/README.markdown
+++ b/README.markdown
@@@ -149,10 -149,6 +149,11 @@@ under the License
* Parth-Brahmbhatt ([@Parth-Brahmbhatt](https://github.com/Parth-Brahmbhatt))
* Adrian Petrescu ([@apetresc](https://github.com/apetresc))
* DashengJu ([@dashengju](https://github.com/dashengju))
+* Jungtaek Lim ([@HeartSaVioR](https://github.com/HeartSaVioR))
+* Li Jiahong ([@Gvain](https://github.com/Gvain))
+* Aaron Levin ([@aaronlevin](https://github.com/aaronlevin))
+* Masatake Iwasaki ([@iwasakims](https://github.com/iwasakims))
++* Milad Fatenejad ([@icksa](https://github.com/icksa))
## Acknowledgements
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/5b425e41/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------