mirror of https://github.com/apache/cloudstack.git
fix build errors with DRS plugins after merge-forward
This commit is contained in:
parent
90526419a3
commit
187f17c216
|
|
@ -24,7 +24,8 @@ import com.cloud.offering.ServiceOffering;
|
|||
import com.cloud.utils.Ternary;
|
||||
import com.cloud.utils.component.AdapterBase;
|
||||
import com.cloud.vm.VirtualMachine;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import javax.naming.ConfigurationException;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -35,7 +36,7 @@ import static org.apache.cloudstack.cluster.ClusterDrsService.ClusterDrsImbalanc
|
|||
|
||||
public class Balanced extends AdapterBase implements ClusterDrsAlgorithm {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(Balanced.class);
|
||||
private static final Logger logger = LogManager.getLogger(Balanced.class);
|
||||
|
||||
@Override
|
||||
public boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> cpuList,
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@ import com.cloud.offering.ServiceOffering;
|
|||
import com.cloud.utils.Ternary;
|
||||
import com.cloud.utils.component.AdapterBase;
|
||||
import com.cloud.vm.VirtualMachine;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import javax.naming.ConfigurationException;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -36,7 +37,7 @@ import static org.apache.cloudstack.cluster.ClusterDrsService.ClusterDrsImbalanc
|
|||
|
||||
public class Condensed extends AdapterBase implements ClusterDrsAlgorithm {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(Condensed.class);
|
||||
private static final Logger logger = LogManager.getLogger(Condensed.class);
|
||||
|
||||
@Override
|
||||
public boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> cpuList,
|
||||
|
|
|
|||
Loading…
Reference in New Issue