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/2f072f4d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f072f4d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f072f4d Branch: refs/heads/trunk Commit: 2f072f4d8be0d591a66b0e0c5a9f55a9ecc42088 Parents: 507b6c0 a7edaa5 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Dec 18 23:09:53 2014 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Dec 18 23:09:53 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f072f4d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f072f4d/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java ----------------------------------------------------------------------
