Updated Branches: refs/heads/trunk 10a65b2df -> 7cb254125
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/7cb25412 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7cb25412 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7cb25412 Branch: refs/heads/trunk Commit: 7cb254125561cc6645b3173bd46deb51972ae618 Parents: 10a65b2 5f399ca Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Dec 10 18:23:39 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Dec 10 18:23:39 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/formatting.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7cb25412/CHANGES.txt ----------------------------------------------------------------------
