[4/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-10 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92688209 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92688209 Diff: http://git-wip-us.apache.org/repos/a

[4/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-10 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1.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/380583b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/380583b5 Diff: http