[5/10] git commit: merge from 1.1

2012-12-18 Thread jbellis
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb9ad748 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb9ad748 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb9ad748 Branch:

[5/10] git commit: merge from 1.1

2012-12-13 Thread jbellis
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34746137 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34746137 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34746137 Branch:

[5/10] git commit: merge from 1.1

2012-12-06 Thread jbellis
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b537567b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b537567b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b537567b Branch: