cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Thu, 31 Aug 2017 13:50:15 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 4d90573c55f08f2a8d72c9ae358618258c4e8b31
Parents: f210b17 5469f21
Author: Aleksey Yeschenko <aleksey@yeschenko.com>
Authored: Thu Aug 31 14:45:49 2017 +0100
Committer: Aleksey Yeschenko <aleksey@yeschenko.com>
Committed: Thu Aug 31 14:45:49 2017 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d90573c/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index 6bb6be2,a2b0ae1..3d6e5cf
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -99,10 -85,10 +99,10 @@@ public class HintedHandOffTes
      public void testHintsMetrics() throws Exception
      {
          for (int i = 0; i < 99; i++)
-             HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
+             HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
          HintedHandOffManager.instance.metrics.log();
  
 -        UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF);
 +        UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS);
          Map<UUID, Integer> returned = rows.one().getMap("hints_dropped", UUIDType.instance,
Int32Type.instance);
          assertEquals(Iterators.getLast(returned.values().iterator()).intValue(), 99);
      }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message