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/cassandra-3.0 Commit: 4d90573c55f08f2a8d72c9ae358618258c4e8b31 Parents: f210b17 5469f21 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Aug 31 14:45:49 2017 +0100 Committer: Aleksey Yeschenko <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
