diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-01-31 17:53:22 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-01-31 17:53:22 +0100 |
| commit | e0c1fce713d6a6cd586a2c1c33f581c75df9764a (patch) | |
| tree | efdec87a5b81d2121480cabf6f9a5b526308136e /node-repository | |
| parent | 025fb0323fda34617204125878be903e1a019f43 (diff) | |
Resolve conflict with HEAD
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostProvisionMaintainerTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostProvisionMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostProvisionMaintainerTest.java index 01c83bbeff4..ebfb838fafa 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostProvisionMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostProvisionMaintainerTest.java @@ -16,6 +16,7 @@ import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.Allocation; import com.yahoo.vespa.hosted.provision.node.Generation; import com.yahoo.vespa.hosted.provision.node.History; +import com.yahoo.vespa.hosted.provision.node.Reports; import com.yahoo.vespa.hosted.provision.node.Status; import com.yahoo.vespa.hosted.provision.provisioning.FlavorConfigBuilder; import com.yahoo.vespa.hosted.provision.provisioning.HostProvisioner; @@ -143,7 +144,7 @@ public class HostProvisionMaintainerTest { false)); Set<String> ips = state == Node.State.active ? Set.of("::1") : Set.of(); return new Node("fake-id-" + hostname, ips, Set.of(), hostname, - parentHostname, flavor, Status.initial(), state, allocation, History.empty(), nodeType); + parentHostname, flavor, Status.initial(), state, allocation, History.empty(), nodeType, new Reports()); } NodeRepository nodeRepository() { |