You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/11/03 19:05:19 UTC
[2/5] storm git commit: Merge branch 'master' of
https://github.com/apache/storm
Merge branch 'master' of https://github.com/apache/storm
Conflicts:
CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f3d60bdf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f3d60bdf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f3d60bdf
Branch: refs/heads/master
Commit: f3d60bdfe2457aec0bffe59adef6df72d5fee608
Parents: ff1962a 895ba42
Author: Rick Kellogg <rm...@comcast.net>
Authored: Sat Sep 5 11:27:32 2015 -0400
Committer: Rick Kellogg <rm...@comcast.net>
Committed: Sat Sep 5 11:27:32 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 8 +-
README.markdown | 2 +
docs/about/multi-language.md | 2 +-
.../clj/backtype/storm/daemon/supervisor.clj | 1 +
.../backtype/storm/messaging/netty/Client.java | 37 +++---
.../src/jvm/backtype/storm/tuple/Fields.java | 21 +++-
.../src/jvm/backtype/storm/tuple/ITuple.java | 126 +++++++++++++++----
.../test/clj/backtype/storm/supervisor_test.clj | 2 +
8 files changed, 155 insertions(+), 44 deletions(-)
----------------------------------------------------------------------