Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66348bbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66348bbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66348bbe
Branch: refs/heads/trunk
Commit: 66348bbe5914581d53e0e76f7c64237d5a625615
Parents: 2b7522f 6afab52
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jan 7 17:13:03 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jan 7 17:13:03 2015 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
