merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9a67831 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9a67831 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9a67831 Branch: refs/heads/trunk Commit: e9a6783198ef9a3742d22569585bb0e7f449c936 Parents: e603555 dc24122 Author: Jonathan Ellis <[email protected]> Authored: Fri Dec 27 16:58:36 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Dec 27 16:58:36 2013 -0600 ---------------------------------------------------------------------- .rat-excludes | 1 + debian/changelog | 6 ++++++ src/java/org/apache/cassandra/io/sstable/Component.java | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9a67831/src/java/org/apache/cassandra/io/sstable/Component.java ----------------------------------------------------------------------
