Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1553d864 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1553d864 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1553d864 Branch: refs/heads/cassandra-3.11 Commit: 1553d864b5909c92cc5cb4a2aeb74622e04aeafc Parents: b52c820 15b5280 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Jan 11 08:16:18 2017 +0100 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Jan 11 08:16:18 2017 +0100 ---------------------------------------------------------------------- build.xml | 6 +++--- .../org/apache/cassandra/db/ColumnFamilyStoreCQLHelper.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1553d864/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1553d864/src/java/org/apache/cassandra/db/ColumnFamilyStoreCQLHelper.java ----------------------------------------------------------------------
