Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1bc2fc59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bc2fc59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bc2fc59 Branch: refs/heads/trunk Commit: 1bc2fc59725b96b7a5e57d30cd4520e20e80bc74 Parents: e49261b cf1de31 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Aug 27 07:36:38 2013 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Aug 27 07:36:38 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../management/StreamStateCompositeData.java | 38 ++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bc2fc59/CHANGES.txt ----------------------------------------------------------------------