Updated Branches: refs/heads/trunk 7ca99351e -> 76bad8cec
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/76bad8ce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76bad8ce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76bad8ce Branch: refs/heads/trunk Commit: 76bad8cec02151ede83aeb9800d5c37e169114d0 Parents: 7ca9935 ae3efc2 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Feb 6 00:05:17 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Feb 6 00:05:17 2013 +0300 ---------------------------------------------------------------------- pylib/cqlshlib/tracing.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
