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/05/19 23:52:32 UTC
[07/24] git commit: Merge branch 'master' of
https://github.com/nathanmarz/storm
Merge branch 'master' of https://github.com/nathanmarz/storm
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/18c0ce77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/18c0ce77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/18c0ce77
Branch: refs/heads/master
Commit: 18c0ce778bb252e1f8b266d3d3b0a568d283257f
Parents: 06aad3f 1e3d266
Author: John Gilmore <jg...@ml.sun.ac.za>
Authored: Wed Oct 9 11:38:49 2013 +0200
Committer: John Gilmore <jg...@ml.sun.ac.za>
Committed: Wed Oct 9 11:38:49 2013 +0200
----------------------------------------------------------------------
conf/defaults.yaml | 7 +++++++
storm-core/src/clj/backtype/storm/testing.clj | 16 ++++++++++++----
storm-core/src/jvm/backtype/storm/Config.java | 12 ++++++++++++
.../jvm/backtype/storm/messaging/netty/Client.java | 7 ++++++-
.../jvm/backtype/storm/messaging/netty/Server.java | 8 +++++++-
5 files changed, 44 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/18c0ce77/conf/defaults.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/18c0ce77/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------