[3/8] git commit: merge from 1.1

2012-11-12 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/93f8fec9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93f8fec9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93f8fec9 Branch:

[3/8] git commit: merge from 1.1

2012-11-12 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/3e770828 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e770828 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e770828 Branch:

[3/8] git commit: merge from 1.1

2012-11-16 Thread xedin
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/bd0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd0b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd0b Branch: