Updated Branches: refs/heads/cassandra-1.1 0f9c391a1 -> 44e7a0890 refs/heads/trunk 090fe813a -> c5f2b57ad
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/c5f2b57a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5f2b57a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5f2b57a Branch: refs/heads/trunk Commit: c5f2b57ad50c6bcadb6ca1d1b8b5ff0f3f023074 Parents: 090fe81 44e7a08 Author: Brandon Williams <[email protected]> Authored: Fri May 4 12:45:11 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri May 4 12:45:11 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 2 +- src/java/org/apache/cassandra/cql3/Cql.g | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
