Updated Branches: refs/heads/trunk 736b2a8e8 -> 8832317ff
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/8832317f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8832317f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8832317f Branch: refs/heads/trunk Commit: 8832317ffaf017a5ddd8552428c2eb3b6cb58da2 Parents: 736b2a8 0b0a00d Author: Aleksey Yeschenko <[email protected]> Authored: Fri Jan 4 17:17:33 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Jan 4 17:17:33 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 55 ++++++++++++++++++++++------------ pylib/cqlshlib/cql3handling.py | 2 +- pylib/cqlshlib/cqlhandling.py | 2 +- 4 files changed, 38 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8832317f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8832317f/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8832317f/pylib/cqlshlib/cqlhandling.py ----------------------------------------------------------------------
