cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/13] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Date Fri, 06 Apr 2012 22:31:34 GMT
Merge branch 'cassandra-1.1.0' into cassandra-1.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/044e17a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/044e17a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/044e17a2

Branch: refs/heads/trunk
Commit: 044e17a229d0a834e3460b166cd75116ea638a18
Parents: be89c8b 9a6d0c7
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Apr 6 17:30:30 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Apr 6 17:30:30 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/044e17a2/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/044e17a2/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------


Mime
View raw message