[2/4] git commit: merge from 1.2

2014-03-13 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3b31490 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3b31490 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3b31490

[2/4] git commit: merge from 1.2

2014-02-28 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b80b97d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b80b97d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b80b97d

[2/4] git commit: merge from 1.2

2013-05-23 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f620b348 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f620b348 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f620b348