Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68ea4895 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68ea4895 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68ea4895 Branch: refs/heads/trunk Commit: 68ea4895ea0c78d5f8029cfb262c61c6f18efe95 Parents: c89c378 7abd76e Author: Marcus Eriksson <[email protected]> Authored: Wed May 21 08:13:46 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Wed May 21 08:13:46 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../streaming/management/SessionInfoCompositeData.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4895/CHANGES.txt ----------------------------------------------------------------------
