Updated Branches: refs/heads/trunk ad72c578e -> 180f32bf2
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/180f32bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/180f32bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/180f32bf Branch: refs/heads/trunk Commit: 180f32bf24392602a3867986040e3b3201c9c492 Parents: ad72c57 96d6aa2 Author: Pavel Yaskevich <[email protected]> Authored: Tue May 15 17:20:04 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Tue May 15 17:20:04 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 4 +- src/java/org/apache/cassandra/config/Schema.java | 2 +- src/java/org/apache/cassandra/cql3/Cql.g | 2 +- .../cassandra/cql3/statements/SelectStatement.java | 46 +++++++------- src/java/org/apache/cassandra/db/DefsTable.java | 2 +- 5 files changed, 29 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/180f32bf/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/180f32bf/src/java/org/apache/cassandra/config/Schema.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/180f32bf/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/180f32bf/src/java/org/apache/cassandra/db/DefsTable.java ----------------------------------------------------------------------
