Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b52a686
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b52a686
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04ef62cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04ef62cb
Diff: http://git-wip-us.apache.org/repos/asf
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e6a433/test/unit/org/apache/cassandra/cql3/validation/operations/DropTest.java
--
diff --cc
test/unit/org/apache/cassandra/cql3/validation/operations/DropTest.java
index
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3841f9cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3841f9cb
Diff: http://git-wip-us.apache.org/repos/asf