Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7226ac9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7226ac9e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7226ac9e Branch: refs/heads/trunk Commit: 7226ac9e617900f7d336bffd46f115261282f327 Parents: e13ea8d ef32d62 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Jan 19 11:02:33 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Jan 19 11:02:33 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/LegacyLayout.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7226ac9e/CHANGES.txt ----------------------------------------------------------------------
