diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-04-29 08:10:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-29 08:10:30 +0200 |
| commit | 8b9248617d3853e1e73a29e19a5002ecdd8d231c (patch) | |
| tree | 634a1fd3d61e0abf52a2866de314c6ad39773a3d /configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java | |
| parent | 7ebc3fe27ab60427ca9b0842730cd9732ada34b5 (diff) | |
| parent | 5fcba48757c67f6c1765a16e48fceb6f696d7724 (diff) | |
Merge pull request #9216 from vespa-engine/revert-9208-jvenstad/config-fix
Revert "Jvenstad/config fix"
Diffstat (limited to 'configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java')
| -rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java index 7d801f93f3a..9ad90e84d86 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java @@ -28,7 +28,6 @@ import com.yahoo.vespa.config.server.model.TestModelFactory; import com.yahoo.vespa.config.server.modelfactory.ModelFactoryRegistry; import com.yahoo.vespa.config.server.provision.HostProvisionerProvider; import com.yahoo.vespa.config.server.tenant.Rotations; -import com.yahoo.vespa.config.server.tenant.TenantBuilder; import com.yahoo.vespa.config.server.zookeeper.ConfigCurator; import com.yahoo.vespa.curator.mock.MockCurator; @@ -218,7 +217,7 @@ public class SessionPreparerTest { return new SessionContext(app, new SessionZooKeeperClient(curator, sessionsPath), app.getAppDir(), - TenantApplications.create(curator, new MockReloadHandler(), TenantName.from("tenant"), TenantBuilder.createLock(curator, TenantName.from("tenant"))), + TenantApplications.create(curator, new MockReloadHandler(), TenantName.from("tenant")), new HostRegistry<>(), new SuperModelGenerationCounter(curator), flagSource); |