You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2013/08/12 18:14:23 UTC
[9/9] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb349d9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb349d9e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb349d9e
Branch: refs/heads/trunk
Commit: cb349d9e7cb808796b1f65984c92ccae28e566d9
Parents: d9a64a4 839cc33
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 12 11:12:39 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 12 11:12:39 2013 -0500
----------------------------------------------------------------------
.../cassandra/streaming/StreamManager.java | 40 ++++-
.../cassandra/streaming/StreamManagerMBean.java | 6 +-
.../management/ProgressInfoCompositeData.java | 103 ++++++++++++
.../SessionCompleteEventCompositeData.java | 71 ++++++++
.../management/SessionInfoCompositeData.java | 163 +++++++++++++++++++
.../management/StreamEventJMXNotifier.java | 88 ++++++++++
.../management/StreamStateCompositeData.java | 102 ++++++++++++
.../management/StreamSummaryCompositeData.java | 82 ++++++++++
.../org/apache/cassandra/tools/NodeProbe.java | 12 +-
9 files changed, 660 insertions(+), 7 deletions(-)
----------------------------------------------------------------------