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/0fd1a0bb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0fd1a0bb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0fd1a0bb Branch: refs/heads/trunk Commit: 0fd1a0bb47f66eaa29ce821aa4836c52b65e46e1 Parents: f3aa83b 2236afb Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Jul 28 12:49:28 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Jul 28 12:49:28 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/io/sstable/metadata/StatsMetadata.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fd1a0bb/CHANGES.txt ----------------------------------------------------------------------
