subject:"\[3\/6\] git commit\: merge from 1.2"

[3/6] git commit: merge from 1.2

2013-08-02 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/aa2936a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa2936a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa2936a8

[3/6] git commit: merge from 1.2

2013-06-18 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/5b0d43f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b0d43f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b0d43f6