Merge branch 'cassandra-1.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae96aace Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae96aace Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae96aace Branch: refs/heads/trunk Commit: ae96aace6d3e3236937615fd26a4f489cb96daa7 Parents: 5bb13b4 1e6cc9a Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Sep 13 13:56:14 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Sep 13 13:56:14 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 7 +++---- pylib/cqlshlib/cql3handling.py | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae96aace/bin/cqlsh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae96aace/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------