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/2d56fee4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d56fee4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d56fee4 Branch: refs/heads/trunk Commit: 2d56fee4f514b4c0619ed780b91fa44e18017629 Parents: 87b0b36 0d81317 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Jan 11 08:17:06 2017 +0100 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Jan 11 08:17:06 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/2d56fee4/build.xml ----------------------------------------------------------------------