[09/10] git commit: merge from 1.2

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

[09/10] git commit: merge from 1.2

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