Merge branch 'cassandra-1.2' 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/7b841aad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b841aad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b841aad
Branch: refs/heads/trunk
Commit: 7b841aade2c7136b00f17815aa293fdbcdfac1dc
Parents: 931be48 25a46ea
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Wed Jul 24 00:57:03 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Wed Jul 24 00:57:03 2013 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
