Skip to content

Commit

Permalink
Fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
bbotella committed Feb 13, 2025
1 parent 432130d commit c96d58a
Showing 1 changed file with 0 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -168,16 +168,11 @@ public abstract class SharedClusterIntegrationTestBase
protected Server server;
protected TestVersion testVersion;
protected MtlsTestHelper mtlsTestHelper;
<<<<<<< HEAD
private final CountDownLatch sidecarSchemaReadyLatch = new CountDownLatch(1);
private IsolatedDTestClassLoaderWrapper classLoaderWrapper;
private Injector sidecarServerInjector;
=======
protected IsolatedDTestClassLoaderWrapper classLoaderWrapper;
protected Injector sidecarServerInjector;
protected HashMap<Server, String> serverDeploymentIds;
protected HashMap<Server, SidecarPeerHealthMonitorTask> peerHealthMonitors;
>>>>>>> 50d464dc (Refactor and improvements)

static
{
Expand Down

0 comments on commit c96d58a

Please sign in to comment.