[2/3] git commit: Merge branch 'cassandra-2.1' into trunk

2014-10-27 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/cli/CliClient.java src/java/org/apache/cassandra/cli/CliMain.java src/java/org/apache/cassandra/cli/CliSessionState.java src/java/org/apache/cassandra/config/DatabaseDescriptor.java

[2/3] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-01 Thread benedict
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0fc6988 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0fc6988 Diff: http://git-wip-us.apache.org/repos/asf/cassand