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/36a66139 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36a66139 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36a66139 Branch: refs/heads/trunk Commit: 36a661394e738d7dbc459ffa56e188286f7d2c7e Parents: a307c17 c1d7121 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Jul 8 23:34:44 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Jul 8 23:34:44 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 4 ++-- pylib/cqlshlib/cqlhandling.py | 10 ++++------ 3 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36a66139/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36a66139/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36a66139/pylib/cqlshlib/cqlhandling.py ----------------------------------------------------------------------
