[5/12] git commit: merge from 1.0

2012-04-02 Thread jbellis
merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3b6e4a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3b6e4a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3b6e4a4 Branch:

[5/12] git commit: merge from 1.0

2012-03-23 Thread jbellis
merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5697c399 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5697c399 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5697c399 Branch:

[5/12] git commit: Merge from 1.0

2012-02-29 Thread brandonwilliams
Merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/470873fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/470873fc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/470873fc Branch:

[5/12] git commit: merge from 1.0

2012-02-13 Thread brandonwilliams
merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5986871 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5986871 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5986871 Branch: