Projects >> lilyproject >>d6368e147f6381eb59e32538265ec6b6c1488a6e

Chunk
Conflicting content 
    private BlobManager blobManager;

    public BlobManagerSetup(URI dfsUri, Configuration configuration, HBaseTableFactory tableFactory, ZooKeeperItf zk,
<<<<<<< HEAD
            Conf blobManagerConf, Configuration hbaseConf) throws IOException, InterruptedException, KeeperException {
=======
            Conf blobManagerConf) throws IOException, InterruptedException, KeeperException {

>>>>>>> f4c8f594d99890789afe33a8648d41dcb41d260a
        fs = FileSystem.get(DfsUri.getBaseDfsUri(dfsUri), configuration);
        Path blobRootPath = new Path(DfsUri.getDfsPath(dfsUri));
Solution content 
    private BlobManager blobManager;

    public BlobManagerSetup(URI dfsUri, Configuration configuration, HBaseTableFactory tableFactory, ZooKeeperItf zk,
            Conf blobManagerConf) throws IOException, InterruptedException, KeeperException {
        fs = FileSystem.get(DfsUri.getBaseDfsUri(dfsUri), configuration);
        Path blobRootPath = new Path(DfsUri.getDfsPath(dfsUri));
File
BlobManagerSetup.java
Developer's decision
Version 2
Kind of conflict
Variable
Chunk
Conflicting content 
import org.junit.Test;
import org.lilyproject.bytes.api.ByteArray;
import org.lilyproject.repository.api.*;
<<<<<<< HEAD
import org.lilyproject.repository.impl.HBaseTypeManager;
=======
import org.lilyproject.repository.api.filter.FieldValueFilter;
import org.lilyproject.repository.api.filter.RecordFilterList;
import org.lilyproject.repository.api.filter.RecordIdPrefixFilter;
import org.lilyproject.repository.api.filter.RecordTypeFilter;
>>>>>>> f4c8f594d99890789afe33a8648d41dcb41d260a
import org.lilyproject.repotestfw.RepositorySetup;
import org.apache.hadoop.hbase.util.Bytes;
import org.lilyproject.util.repo.PrintUtil;
Solution content 
import org.junit.Test;
import org.lilyproject.bytes.api.ByteArray;
import org.lilyproject.repository.api.*;
import org.lilyproject.repository.api.filter.FieldValueFilter;
import org.lilyproject.repository.api.filter.RecordFilterList;
import org.lilyproject.repository.api.filter.RecordIdPrefixFilter;
import org.lilyproject.repository.api.filter.RecordTypeFilter;
import org.lilyproject.repotestfw.RepositorySetup;
import org.apache.hadoop.hbase.util.Bytes;
import org.lilyproject.util.repo.PrintUtil;
File
AbstractRepositoryTest.java
Developer's decision
Version 2
Kind of conflict
Import