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/e6eb5506
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6eb5506
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6eb5506
Branch: refs/heads/cassandra-2.0
Commit: e6eb5506ae82cf7f6558e3b39fccbb3a7b90cce0
Parents: ca7335e f7c9144
Author: Aleksey Yeschenko <[email protected]>
Authored: Thu Dec 12 21:16:53 2013 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Thu Dec 12 21:16:53 2013 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
