Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ea405ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ea405ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ea405ed Branch: refs/heads/trunk Commit: 2ea405edd3b2ff3e885eadd3afe4bcd62602a35c Parents: a7820f9 997c49a Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Sep 18 22:49:50 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Sep 18 22:49:50 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- bin/cqlsh | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ea405ed/CHANGES.txt ----------------------------------------------------------------------
