Updated Branches: refs/heads/trunk b7eaf009c -> 210543588
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/21054358 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21054358 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21054358 Branch: refs/heads/trunk Commit: 2105435880a4291214011243353f2a118a783eb9 Parents: b7eaf00 b8d8802 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Jan 2 21:08:33 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Jan 2 21:08:33 2013 +0300 ---------------------------------------------------------------------- .rat-excludes | 1 + CHANGES.txt | 1 + build.xml | 2 +- debian/changelog | 6 ++++ doc/cql3/CQL.textile | 22 +++++++++++++- .../org/apache/cassandra/service/ClientState.java | 6 ++-- 6 files changed, 32 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21054358/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21054358/build.xml ----------------------------------------------------------------------
