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/cba3c014 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cba3c014 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cba3c014 Branch: refs/heads/trunk Commit: cba3c0141acbe5f327622c87253c0e8316918867 Parents: bcb6762 2ff97fe Author: Branimir Lambov <branimir.lam...@datastax.com> Authored: Wed Nov 30 14:48:24 2016 +0200 Committer: Branimir Lambov <branimir.lam...@datastax.com> Committed: Wed Nov 30 14:49:11 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/restrictions/StatementRestrictions.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba3c014/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba3c014/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java ----------------------------------------------------------------------
