[10/11] git commit: merge from 1.2

2013-10-14 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/810f0678 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/810f0678 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/810f0678 Branch:

[10/11] git commit: merge from 1.2

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

[10/11] git commit: merge from 1.2

2013-09-24 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/07638f41 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07638f41 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07638f41 Branch: