Updated Branches: refs/heads/trunk efa4ae1e5 -> c61a95b64
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c61a95b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c61a95b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c61a95b6 Branch: refs/heads/trunk Commit: c61a95b64190fc4cf85c56c562170afa1abcf237 Parents: efa4ae1 eed1b53 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Jan 31 22:08:28 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Jan 31 22:08:28 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql/QueryProcessor.java | 3 ++- .../cassandra/cql3/statements/UseStatement.java | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c61a95b6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7ab72d1,03218b9..322512b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -8,8 -1,8 +8,9 @@@ 1.2.2 * fix symlinks under data dir not working (CASSANDRA-5185) * fix bug in compact storage metadata handling (CASSANDRA-5189) + * Validate login for USE queries (CASSANDRA-5207) + 1.2.1 * stream undelivered hints on decommission (CASSANDRA-5128) * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c61a95b6/src/java/org/apache/cassandra/cql/QueryProcessor.java ----------------------------------------------------------------------
