Updated Branches: refs/heads/trunk 7b0b27c52 -> 949529af4
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/949529af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/949529af Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/949529af Branch: refs/heads/trunk Commit: 949529af4d7cd643d1b039611dca0f745c94fdc9 Parents: 7b0b27c 763465b Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Nov 17 21:12:36 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Nov 17 21:12:36 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/formatting.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/949529af/CHANGES.txt ----------------------------------------------------------------------