Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2236afb7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2236afb7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2236afb7 Branch: refs/heads/trunk Commit: 2236afb7a06725f9ceb13bab8c2180eb0d6134f5 Parents: 3744d77 ee62ae1 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Jul 28 12:49:06 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Jul 28 12:49:06 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/2236afb7/CHANGES.txt ----------------------------------------------------------------------
