Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/Selection.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e530f423
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e530f423
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e530f423
Branch: refs/heads/trunk
Commit: e530f4230ede7227f274ca6441ce0f98007300b3
Parents: 2fdd1d5 025a635
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Dec 12 11:01:08 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Dec 12 11:01:08 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e530f423/CHANGES.txt
----------------------------------------------------------------------
