Updated Branches: refs/heads/trunk 15269be39 -> 62491eaa2
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/62491eaa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62491eaa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62491eaa Branch: refs/heads/trunk Commit: 62491eaa2978141558e140ddfe97782d6c19ba43 Parents: 15269be 42175b6 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Feb 16 12:37:57 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Feb 16 12:37:57 2012 -0600 ---------------------------------------------------------------------- bin/cqlsh | 167 +++++++++++++++++++++++++++++++++++++++++-------------- build.xml | 2 +- 2 files changed, 125 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
