[6/8] git commit: merge from 1.2

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

[6/8] git commit: merge from 1.2

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

[6/8] 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/5817aa95 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5817aa95 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5817aa95 Branch:

[6/8] git commit: merge from 1.2

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