cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [5/5] git commit: Merge branch 'cassandra-1.2' into trunk
Date Sat, 04 May 2013 18:43:29 GMT
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
	test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java


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

Branch: refs/heads/trunk
Commit: ec5f416a466f3de8c1341cc426f25dcce7a7e723
Parents: b505b90 ac1d7ee
Author: Marcus Eriksson <marcuse@spotify.com>
Authored: Sat May 4 20:34:34 2013 +0200
Committer: Marcus Eriksson <marcuse@spotify.com>
Committed: Sat May 4 20:42:25 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                        |    4 +-
 build.xml                                          |   89 ++++++---------
 debian/changelog                                   |    6 +
 .../service/AntiEntropyServiceTestAbstract.java    |    2 +
 4 files changed, 45 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec5f416a/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec5f416a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
index 04930d3,fc0b832..b120a3f
--- a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
+++ b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
@@@ -42,7 -42,9 +42,8 @@@ import org.apache.cassandra.dht.Token
  import org.apache.cassandra.gms.Gossiper;
  import org.apache.cassandra.locator.AbstractReplicationStrategy;
  import org.apache.cassandra.locator.TokenMetadata;
 -import static org.apache.cassandra.service.AntiEntropyService.*;
 -
 +import static org.apache.cassandra.service.ActiveRepairService.*;
+ import org.apache.cassandra.net.MessagingService;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
  import org.apache.cassandra.utils.MerkleTree;


Mime
View raw message