[06/12] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-07-29 Thread brandonwilliams
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b44bbb83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b44bbb83 Diff: http://git-wip-us.apache.org/repos/asf

[06/12] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-19 Thread jbellis
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55d8da44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55d8da44 Diff: http://git-wip-us.apache.org/repos/asf