Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04ba4623
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04ba4623
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04ba4623
Branch: refs/heads/cassandra-2.1
Commit: 04ba46231d4ce6a354762a41313349ef0a24655d
Parents: 35efdc1 a374821
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Wed May 28 23:23:52 2014 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Wed May 28 23:23:52 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
