[09/15] git commit: merge from 1.2

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

[09/15] git commit: merge from 1.2

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

[09/15] git commit: merge from 1.2

2014-03-13 Thread xedin
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