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/748beafe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/748beafe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/748beafe Branch: refs/heads/trunk Commit: 748beafeba22355501648dc87e5c525d6ec1ba22 Parents: 9e8391a 1bc2fc5 Author: Yuki Morishita <[email protected]> Authored: Tue Aug 27 07:36:51 2013 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue Aug 27 07:36:51 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/748beafe/CHANGES.txt ----------------------------------------------------------------------
