Projects >> voldemort >>1c3f6735245467ab7aa1be3fcfc5e5c0e4b158c1

Chunk
Conflicting content 
                                                   RequestFormatType.VOLDEMORT_V1.getCode());
        this.requestFormatType = RequestFormatType.fromCode(requestFormatName);

<<<<<<< HEAD
        this.failureDetector = props.getString("failure.detector",
                                               BannagePeriodFailureDetector.class.getName());
=======
        // network class loader disable by default.
        this.enableNetworkClassLoader = props.getBoolean("enable.network.classloader", false);
>>>>>>> 233e2d0dd3699fbfad285d2bfdbfc579786191bd

        validateParams();
    }
Solution content 
                                                   RequestFormatType.VOLDEMORT_V1.getCode());
        this.requestFormatType = RequestFormatType.fromCode(requestFormatName);

        this.failureDetector = props.getString("failure.detector",
                                               BannagePeriodFailureDetector.class.getName());

        // network class loader disable by default.
        this.enableNetworkClassLoader = props.getBoolean("enable.network.classloader", false);

        validateParams();
    }
File
VoldemortConfig.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
        this.retentionCleanupScheduledPeriodInHour = retentionCleanupScheduledPeriodInHour;
    }

<<<<<<< HEAD
=======
    public int getAdminSocketTimeout() {
        return adminSocketTimeout;
    }

    public void setAdminSocketTimeout(int adminSocketTimeout) {
        this.adminSocketTimeout = adminSocketTimeout;
    }

    public int getAdminConnectionTimeout() {
        return adminConnectionTimeout;
    }

    public void setAdminConnectionTimeout(int adminConnectionTimeout) {
        this.adminConnectionTimeout = adminConnectionTimeout;
    }
        return enableNetworkClassLoader;
    }

    public void setEnableNetworkClassLoader(boolean enableNetworkClassLoader) {
        this.enableNetworkClassLoader = enableNetworkClassLoader;
    }
>>>>>>> 233e2d0dd3699fbfad285d2bfdbfc579786191bd
}

    public String getReadOnlySearchStrategy() {
        return readOnlySearchStrategy;
    }

    public void setReadOnlySearchStrategy(String readOnlySearchStrategy) {
        this.readOnlySearchStrategy = readOnlySearchStrategy;
    }

    public boolean isNetworkClassLoaderEnabled() {
Solution content 
    public boolean isNetworkClassLoaderEnabled() {
        this.retentionCleanupScheduledPeriodInHour = retentionCleanupScheduledPeriodInHour;
    }

    public int getAdminSocketTimeout() {
        return adminSocketTimeout;
    }

    public void setAdminSocketTimeout(int adminSocketTimeout) {
        this.adminSocketTimeout = adminSocketTimeout;
    }

    public int getAdminConnectionTimeout() {
        return adminConnectionTimeout;
    }

    public void setAdminConnectionTimeout(int adminConnectionTimeout) {
        this.adminConnectionTimeout = adminConnectionTimeout;
    }

    public String getReadOnlySearchStrategy() {
        return readOnlySearchStrategy;
    }

    public void setReadOnlySearchStrategy(String readOnlySearchStrategy) {
        this.readOnlySearchStrategy = readOnlySearchStrategy;
    }

        return enableNetworkClassLoader;
    }

    public void setEnableNetworkClassLoader(boolean enableNetworkClassLoader) {
        this.enableNetworkClassLoader = enableNetworkClassLoader;
    }

}
File
VoldemortConfig.java
Developer's decision
Version 2
Kind of conflict
Method declaration