[4/7] git commit: merge from 1.2

2014-02-06 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/0b6913ee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b6913ee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b6913ee Branch:

[4/7] git commit: merge from 1.2

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

[4/7] git commit: merge from 1.2

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