Merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51767c19 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51767c19 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51767c19 Branch: refs/heads/cassandra-1.1 Commit: 51767c198d2ef831b7c7f2e31254d3308b3b96f3 Parents: 5979bce be9fa05 Author: Brandon Williams <[email protected]> Authored: Tue May 15 17:24:26 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 15 17:24:26 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51767c19/bin/cqlsh ---------------------------------------------------------------------- diff --cc bin/cqlsh index fffd95e,d3d4eb4..85e1228 --- a/bin/cqlsh +++ b/bin/cqlsh @@@ -48,9 -45,8 +48,10 @@@ import tim import optparse import ConfigParser import codecs + import locale import re +import platform +import warnings # cqlsh should run correctly when run out of a Cassandra source tree, # out of an unpacked Cassandra tarball, and after a proper package install.
