cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [8/8] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 02 Apr 2014 19:43:39 GMT
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/c7324473
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7324473
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7324473

Branch: refs/heads/trunk
Commit: c7324473fe07a92e21d3e8d3762fd0560b36ea5a
Parents: 7051710 5ab1a34
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Apr 2 14:43:25 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Apr 2 14:43:25 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                      |  1 +
 src/java/org/apache/cassandra/db/Keyspace.java   |  8 ++++++++
 .../cassandra/service/CassandraDaemon.java       |  6 +++---
 .../apache/cassandra/service/StorageService.java |  8 +++++---
 test/unit/org/apache/cassandra/SchemaLoader.java |  7 ++++---
 .../cassandra/config/DatabaseDescriptorTest.java | 13 +++++++++----
 .../io/sstable/CQLSSTableWriterTest.java         | 10 +++++++---
 .../cassandra/io/sstable/LegacySSTableTest.java  | 19 ++++++++++++++-----
 .../cassandra/io/sstable/SSTableLoaderTest.java  |  1 +
 .../apache/cassandra/locator/EC2SnitchTest.java  | 12 +++++++-----
 .../service/StorageServiceServerTest.java        |  1 +
 11 files changed, 60 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7324473/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7324473/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message