Updated Branches: refs/heads/cassandra-1.0 17d6354f6 -> 016244785 refs/heads/cassandra-1.1 be89c8b18 -> 044e17a22 refs/heads/cassandra-1.1.0 25da034fb -> 9a6d0c7cc refs/heads/trunk d6933d6f2 -> 5b4a7f299
Merge branch 'cassandra-1.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/5b4a7f29 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b4a7f29 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b4a7f29 Branch: refs/heads/trunk Commit: 5b4a7f29980621a162fdc202a17bd3300c20e298 Parents: d6933d6 044e17a Author: Jonathan Ellis <[email protected]> Authored: Fri Apr 6 17:30:41 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Apr 6 17:30:41 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 12 +++- conf/cassandra.yaml | 48 ++++++++++++--- src/java/org/apache/cassandra/cli/CliClient.java | 2 +- src/java/org/apache/cassandra/cli/CliCompiler.java | 2 +- .../cassandra/config/DatabaseDescriptor.java | 6 +- .../cassandra/locator/Ec2MultiRegionSnitch.java | 7 +-- .../cassandra/net/OutboundTcpConnectionPool.java | 5 ++ 7 files changed, 62 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b4a7f29/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b4a7f29/src/java/org/apache/cassandra/cli/CliClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b4a7f29/src/java/org/apache/cassandra/cli/CliCompiler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b4a7f29/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b4a7f29/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b4a7f29/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java ----------------------------------------------------------------------
