cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 25 Jun 2014 03:14:38 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/005835e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/005835e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/005835e0

Branch: refs/heads/trunk
Commit: 005835e08f8c96ced4f876f169e8c657751a8b81
Parents: 18f062c 1569bd9
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Jun 24 22:14:22 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Jun 24 22:14:22 2014 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml                             |   5 -
 .../org/apache/cassandra/config/Config.java     |   1 -
 .../cassandra/config/DatabaseDescriptor.java    |  15 --
 .../cassandra/db/HintedHandOffManager.java      |   2 +-
 .../cassandra/thrift/CassandraServer.java       |   2 +-
 test/conf/cassandra.yaml                        |   1 -
 .../apache/cassandra/db/RangeTombstoneTest.java |  13 +-
 .../db/compaction/CompactionsTest.java          | 142 +++++++++----------
 8 files changed, 69 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/005835e0/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/005835e0/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/005835e0/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/005835e0/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/005835e0/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------


Mime
View raw message