Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59949ac3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59949ac3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59949ac3 Branch: refs/heads/trunk Commit: 59949ac38d1e2b85a66d2b8a4fec9302766f8f90 Parents: 49a2da9 dbf0310 Author: T Jake Luciani <j...@apache.org> Authored: Wed Jun 1 16:11:11 2016 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed Jun 1 16:11:11 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java | 3 ++- src/java/org/apache/cassandra/tools/StandaloneSSTableUtil.java | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59949ac3/CHANGES.txt ----------------------------------------------------------------------
