private static final Pattern HEAP_PATTERN = Pattern.compile("(\\d+)([mgMG])");
private static final Logger LOG = LoggerFactory.getLogger(ConfigMergeHelper.class);
@Inject
private Provider<Clusters> m_clusters;
@Inject
<BUG>private Provider<AmbariMetaInfo> m_ambariMetaInfo;
@SuppressWarnings("unchecked")</BUG>
public Map<String, Map<String, ThreeWayValue>> getConflicts(String clusterName, StackId targetStack) throws AmbariException {
Cluster cluster = m_clusters.get().getCluster(clusterName);
StackId oldStack = cluster.getCurrentStackVersion();

private static final Pattern HEAP_PATTERN = Pattern.compile("(\\d+)([mgMG])");
private static final Logger LOG = LoggerFactory.getLogger(ConfigMergeHelper.class);
@Inject
private Provider<Clusters> m_clusters;
@Inject
private Provider<AmbariMetaInfo> m_ambariMetaInfo;
@Inject
private Provider<RepositoryVersionDAO> repositoryVersionDaoProvider;
@SuppressWarnings("unchecked")
public Map<String, Map<String, ThreeWayValue>> getConflicts(String clusterName, StackId targetStack) throws AmbariException {
Cluster cluster = m_clusters.get().getCluster(clusterName);
StackId oldStack = cluster.getCurrentStackVersion();
