[3/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0

Merge branch 'cassandra-1.2' into cassandra-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5bf1fc13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5bf1fc13 Diff: http://git-wip-us.apache.org/repos/a

[3/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0

Merge branch 'cassandra-1.2' into cassandra-2.0.0 Conflicts: src/java/org/apache/cassandra/config/DatabaseDescriptor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7e02052e Tree: http://git-wip-us.apache