Projects >> Priam >>ae8aaf55490790b5e92940716cd16799ad06f378

Chunk
Conflicting content 
}
     */
    public String getInternodeCompression();

<<<<<<< HEAD
    public boolean isBackingUpCommitLogs();

    public String getCommitLogBackupArchiveCmd();

    public String getCommitLogBackupRestoreCmd();

    public String getCommitLogBackupRestoreFromDirs();

    public String getCommitLogBackupRestorePointInTime();
=======

    /**
     * @return true/false, if Cassandra is running in a VPC environment
     */
    public boolean isVpcRing();
>>>>>>> 7642dd36aeb7f45abb748c66b4f24af106f52e1f
Solution content 
     */
    public String getInternodeCompression();

    public boolean isBackingUpCommitLogs();

    public String getCommitLogBackupArchiveCmd();

    public String getCommitLogBackupRestoreCmd();

    public String getCommitLogBackupRestoreFromDirs();

    public String getCommitLogBackupRestorePointInTime();

    /**
     * @return true/false, if Cassandra is running in a VPC environment
     */
    public boolean isVpcRing();
}
File
IConfiguration.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD
    public boolean isBackingUpCommitLogs()
    {
        return config.get(CONFIG_COMMITLOG_BKUP_ENABLED, false);
    }

    @Override
    public String getCommitLogBackupArchiveCmd()
    {
        return config.get(CONFIG_COMMITLOG_ARCHIVE_CMD, "");
    }

    @Override
    public String getCommitLogBackupRestoreCmd()
    {
        return config.get(CONFIG_COMMITLOG_RESTORE_CMD, "");
    }

    @Override
    public String getCommitLogBackupRestoreFromDirs()
    {
        return config.get(CONFIG_COMMITLOG_RESTORE_DIRS, "");
    }

    @Override
    public String getCommitLogBackupRestorePointInTime()
    {
        return config.get(CONFIG_COMMITLOG_RESTORE_POINT_IN_TIME, "");
    }
=======
    public boolean isVpcRing() {
        return config.get(CONFIG_VPC_RING, false);
    }

>>>>>>> 7642dd36aeb7f45abb748c66b4f24af106f52e1f
}
Solution content 
    }

    @Override
    public boolean isBackingUpCommitLogs()
    {
        return config.get(CONFIG_COMMITLOG_BKUP_ENABLED, false);
    }

    @Override
    public String getCommitLogBackupArchiveCmd()
    {
        return config.get(CONFIG_COMMITLOG_ARCHIVE_CMD, "");
    }

    @Override
    public String getCommitLogBackupRestoreCmd()
    {
        return config.get(CONFIG_COMMITLOG_RESTORE_CMD, "");
    }

    @Override
    public String getCommitLogBackupRestoreFromDirs()
    {
        return config.get(CONFIG_COMMITLOG_RESTORE_DIRS, "");
    }

    @Override
    public String getCommitLogBackupRestorePointInTime()
    {
        return config.get(CONFIG_COMMITLOG_RESTORE_POINT_IN_TIME, "");
    }

    @Override
    public boolean isVpcRing() {
        return config.get(CONFIG_VPC_RING, false);
    }

}
File
PriamConfiguration.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Method declaration