Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3535ed55 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3535ed55 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3535ed55 Branch: refs/heads/trunk Commit: 3535ed5555e8f512deef01df171cd830069a2eba Parents: 4d7918d 72d0c81 Author: Jeff Jirsa <[email protected]> Authored: Tue Oct 18 18:12:38 2016 -0700 Committer: Jeff Jirsa <[email protected]> Committed: Tue Oct 18 18:15:02 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3535ed55/CHANGES.txt ----------------------------------------------------------------------
