Merge branch 'cassandra-1.2' into trunk
Conflicts:
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/308afb20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/308afb20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/308afb20
Branch: refs/heads/trunk
Commit: 308afb20bed382a2a1d0424bef23a683cf1ad99e
Parents: 2548e5a 187f73f
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Sat Jul 27 04:45:02 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Sat Jul 27 04:45:02 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/308afb20/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/308afb20/bin/cqlsh
----------------------------------------------------------------------
