Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e10da08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e10da08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e10da08 Branch: refs/heads/trunk Commit: 6e10da0820022116fbb4223cbaffb927656933a7 Parents: 63f6c84 2ca983d Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Apr 5 15:11:09 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Apr 5 15:11:09 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e10da08/CHANGES.txt ----------------------------------------------------------------------