| Chunk |
|---|
| Conflicting content |
|---|
public static boolean trackUsageStatistics = true;
public static String STORAGE_HOST = "127.0.0.1";
<<<<<<< HEAD
static { GroovyUtil.loadConfig("storageprops.groovy"); }
=======
//DAS properties
public static String DAS_PARTITION = "/dev/sde";
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
public static void updateName() {
if(!Component.eucalyptus.isLocal()) {
String scName = System.getProperty("euca.storage.name"); |
| Solution content |
|---|
public static boolean trackUsageStatistics = true;
public static String STORAGE_HOST = "127.0.0.1";
public static String DAS_DEVICE = "/dev/blockdev";
public static void updateName() {
if(!Component.eucalyptus.isLocal()) {
String scName = System.getProperty("euca.storage.name"); |
| File |
|---|
| StorageProperties.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Static initializer |
| Chunk |
|---|
| Conflicting content |
|---|
private String volumesDir;
@Column(name = "zero_fill_volumes")
private Boolean zeroFillVolumes;
<<<<<<< HEAD
@Column(name = "san_host")
private String sanHost;
@Column(name = "san_user")
private String sanUser;
@Column(name = "san_password")
private String sanPassword;
=======
@Column(name = "das_partition")
private String DASPartition;
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
public StorageInfo(){}
public StorageInfo( final String name ) |
| Solution content |
|---|
private String volumesDir;
@Column(name = "zero_fill_volumes")
private Boolean zeroFillVolumes;
@Column(name = "san_host")
private String sanHost;
@Column(name = "san_user")
private String sanUser;
@Column(name = "san_password")
private String sanPassword;
@Column(name = "das_device")
private String DASDevice;
public StorageInfo(){}
public StorageInfo( final String name ) |
| File |
|---|
| StorageInfo.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
final Integer maxVolumeSizeInGB,
final String volumesDir,
final Boolean zeroFillVolumes,
<<<<<<< HEAD
final String sanHost,
final String sanUser,
final String sanPassword) {
=======
final String DASPartition) {
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
this.name = name;
this.maxTotalVolumeSizeInGb = maxTotalVolumeSizeInGb;
this.storageInterface = storageInterface; |
| Solution content |
|---|
final Integer maxVolumeSizeInGB,
final String volumesDir,
final Boolean zeroFillVolumes,
final String sanHost,
final String sanUser,
final String sanPassword,
final String DASDevice) {
this.name = name;
this.maxTotalVolumeSizeInGb = maxTotalVolumeSizeInGb;
this.storageInterface = storageInterface; |
| File |
|---|
| StorageInfo.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
this.maxVolumeSizeInGB = maxVolumeSizeInGB; this.volumesDir = volumesDir; this.zeroFillVolumes = zeroFillVolumes; <<<<<<< HEAD this.sanHost = sanHost; this.sanUser = sanUser; this.sanPassword = sanPassword; ======= this.DASPartition = DASPartition; >>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b } public Long getId() |
| Solution content |
|---|
this.maxVolumeSizeInGB = maxVolumeSizeInGB; this.volumesDir = volumesDir; this.zeroFillVolumes = zeroFillVolumes; this.sanHost = sanHost; this.sanUser = sanUser; this.sanPassword = sanPassword; this.DASDevice = DASDevice; } public Long getId() |
| File |
|---|
| StorageInfo.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
this.zeroFillVolumes = zeroFillVolumes;
}
<<<<<<< HEAD
public String getSanHost() {
return sanHost;
}
public void setSanHost(String sanHost) {
this.sanHost = sanHost;
}
public String getSanUser() {
return sanUser;
}
public void setSanUser(String sanUser) {
this.sanUser = sanUser;
}
public String getSanPassword() {
return sanPassword;
}
public void setSanPassword(String sanPassword) {
this.sanPassword = sanPassword;
=======
public String getDASPartition() {
return DASPartition;
}
public void setDASPartition(String dASPartition) {
DASPartition = dASPartition;
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
}
@Override |
| Solution content |
|---|
this.zeroFillVolumes = zeroFillVolumes;
}
public String getSanHost() {
return sanHost;
}
public void setSanHost(String sanHost) {
this.sanHost = sanHost;
}
public String getSanUser() {
return sanUser;
}
public void setSanUser(String sanUser) {
this.sanUser = sanUser;
}
public String getSanPassword() {
return sanPassword;
}
public void setSanPassword(String sanPassword) {
this.sanPassword = sanPassword;
}
public String getDASDevice() {
return DASDevice;
}
public void setDASDevice(String DASDevice) {
this.DASDevice = DASDevice;
}
@Override |
| File |
|---|
| StorageInfo.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Method declaration |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
}
StorageProperties.MAX_VOLUME_SIZE = storageInfo.getMaxVolumeSizeInGB();
StorageProperties.storageRootDirectory = storageInfo.getVolumesDir();
StorageProperties.zeroFillVolumes = storageInfo.getZeroFillVolumes();
<<<<<<< HEAD
StorageProperties.SAN_HOST = storageInfo.getSanHost();
StorageProperties.SAN_USERNAME = storageInfo.getSanUser();
try {
if(!StorageProperties.DUMMY_SAN_PASSWORD.equals(storageInfo.getSanPassword())) {
StorageProperties.SAN_PASSWORD = BlockStorageUtil.decryptSCTargetPassword(storageInfo.getSanPassword());
} else {
LOG.info("SAN credentials not configured yet.");
}
} catch (EucalyptusCloudException e) {
LOG.fatal("Unable to get password. " + e.getMessage());
}
=======
StorageProperties.DAS_PARTITION = storageInfo.getDASPartition();
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
StorageProperties.updateStorageHost();
blockManager.configure(); |
| Solution content |
|---|
StorageProperties.MAX_VOLUME_SIZE = storageInfo.getMaxVolumeSizeInGB();
StorageProperties.storageRootDirectory = storageInfo.getVolumesDir();
StorageProperties.zeroFillVolumes = storageInfo.getZeroFillVolumes();
StorageProperties.SAN_HOST = storageInfo.getSanHost();
StorageProperties.SAN_USERNAME = storageInfo.getSanUser();
try {
if(!StorageProperties.DUMMY_SAN_PASSWORD.equals(storageInfo.getSanPassword())) {
StorageProperties.SAN_PASSWORD = BlockStorageUtil.decryptSCTargetPassword(storageInfo.getSanPassword());
} else {
LOG.info("SAN credentials not configured yet.");
}
} catch (EucalyptusCloudException e) {
LOG.fatal("Unable to get password. " + e.getMessage());
}
StorageProperties.DAS_DEVICE = storageInfo.getDASDevice();
StorageProperties.updateStorageHost();
blockManager.configure();
} |
| File |
|---|
| BlockStorage.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Try statement |
| Chunk |
|---|
| Conflicting content |
|---|
StorageProperties.MAX_VOLUME_SIZE, StorageProperties.storageRootDirectory, StorageProperties.zeroFillVolumes, <<<<<<< HEAD StorageProperties.SAN_HOST, StorageProperties.SAN_USERNAME, StorageProperties.SAN_PASSWORD); ======= StorageProperties.DAS_PARTITION); >>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b db.add(storageInfo); db.commit(); } |
| Solution content |
|---|
StorageProperties.MAX_VOLUME_SIZE, StorageProperties.storageRootDirectory, StorageProperties.zeroFillVolumes, StorageProperties.SAN_HOST, StorageProperties.SAN_USERNAME, StorageProperties.SAN_PASSWORD, StorageProperties.DAS_DEVICE); db.add(storageInfo); db.commit(); } |
| File |
|---|
| BlockStorage.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Other |
| Chunk |
|---|
| Conflicting content |
|---|
storageInfo.setMaxVolumeSizeInGB(StorageProperties.MAX_VOLUME_SIZE);
storageInfo.setVolumesDir(StorageProperties.storageRootDirectory);
storageInfo.setZeroFillVolumes(StorageProperties.zeroFillVolumes);
<<<<<<< HEAD
storageInfo.setSanHost(StorageProperties.SAN_HOST);
storageInfo.setSanUser(StorageProperties.SAN_USERNAME);
try {
storageInfo.setSanPassword(BlockStorageUtil.encryptSCTargetPassword(StorageProperties.SAN_PASSWORD));
} catch (EucalyptusCloudException e) {
LOG.fatal("Unable to update password. " + e.getMessage());
}
=======
storageInfo.setDASPartition(StorageProperties.DAS_PARTITION);
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
db.commit();
} catch(EucalyptusCloudException ex) {
storageInfo = new StorageInfo(StorageProperties.NAME, |
| Solution content |
|---|
storageInfo.setMaxVolumeSizeInGB(StorageProperties.MAX_VOLUME_SIZE);
storageInfo.setVolumesDir(StorageProperties.storageRootDirectory);
storageInfo.setZeroFillVolumes(StorageProperties.zeroFillVolumes);
storageInfo.setSanHost(StorageProperties.SAN_HOST);
storageInfo.setSanUser(StorageProperties.SAN_USERNAME);
try {
storageInfo.setSanPassword(BlockStorageUtil.encryptSCTargetPassword(StorageProperties.SAN_PASSWORD));
} catch (EucalyptusCloudException e) {
LOG.fatal("Unable to update password. " + e.getMessage());
}
storageInfo.setDASDevice(StorageProperties.DAS_DEVICE);
db.commit();
} catch(EucalyptusCloudException ex) {
storageInfo = new StorageInfo(StorageProperties.NAME, |
| File |
|---|
| BlockStorage.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Try statement |
| Chunk |
|---|
| Conflicting content |
|---|
StorageProperties.MAX_VOLUME_SIZE, StorageProperties.storageRootDirectory, StorageProperties.zeroFillVolumes, <<<<<<< HEAD StorageProperties.SAN_HOST, StorageProperties.SAN_USERNAME, StorageProperties.SAN_PASSWORD); ======= StorageProperties.DAS_PARTITION); >>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b db.add(storageInfo); db.commit(); } |
| Solution content |
|---|
StorageProperties.MAX_VOLUME_SIZE, StorageProperties.storageRootDirectory, StorageProperties.zeroFillVolumes, StorageProperties.SAN_HOST, StorageProperties.SAN_USERNAME, StorageProperties.SAN_PASSWORD, StorageProperties.DAS_DEVICE); db.add(storageInfo); db.commit(); } |
| File |
|---|
| BlockStorage.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Other |
| Chunk |
|---|
| Conflicting content |
|---|
Boolean zeroFillVolumes = request.getZeroFillVolumes(); if(zeroFillVolumes != null) StorageProperties.zeroFillVolumes = zeroFillVolumes; <<<<<<< HEAD if(request.getSanHost() != null) StorageProperties.SAN_HOST = request.getSanHost(); if(request.getSanUser() != null) StorageProperties.SAN_USERNAME = request.getSanUser(); if(request.getSanPassword() != null) StorageProperties.SAN_PASSWORD = request.getSanPassword(); ======= if(request.getDASPartition() != null) StorageProperties.DAS_PARTITION = request.getDASPartition(); >>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b check(); //test connection to Walrus StorageProperties.updateWalrusUrl(); |
| Solution content |
|---|
Boolean zeroFillVolumes = request.getZeroFillVolumes(); if(zeroFillVolumes != null) StorageProperties.zeroFillVolumes = zeroFillVolumes; if(request.getSanHost() != null) StorageProperties.SAN_HOST = request.getSanHost(); if(request.getSanUser() != null) StorageProperties.SAN_USERNAME = request.getSanUser(); if(request.getSanPassword() != null) StorageProperties.SAN_PASSWORD = request.getSanPassword(); if(request.getDASDevice() != null) StorageProperties.DAS_DEVICE = request.getDASDevice(); check(); //test connection to Walrus StorageProperties.updateWalrusUrl(); |
| File |
|---|
| BlockStorage.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
reply.setMaxVolumeSize(StorageProperties.MAX_VOLUME_SIZE); reply.setStorageInterface(StorageProperties.iface); reply.setZeroFillVolumes(StorageProperties.zeroFillVolumes); <<<<<<< HEAD reply.setSanHost(StorageProperties.SAN_HOST); reply.setSanUser(StorageProperties.SAN_USERNAME); reply.setSanPassword(StorageProperties.SAN_PASSWORD); ======= reply.setDASPartition(StorageProperties.DAS_PARTITION); >>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b reply.setName(StorageProperties.NAME); } return reply; |
| Solution content |
|---|
reply.setMaxVolumeSize(StorageProperties.MAX_VOLUME_SIZE); reply.setStorageInterface(StorageProperties.iface); reply.setZeroFillVolumes(StorageProperties.zeroFillVolumes); reply.setSanHost(StorageProperties.SAN_HOST); reply.setSanUser(StorageProperties.SAN_USERNAME); reply.setSanPassword(StorageProperties.SAN_PASSWORD); reply.setDASDevice(StorageProperties.DAS_DEVICE); reply.setName(StorageProperties.NAME); } return reply; |
| File |
|---|
| BlockStorage.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
public class BlockStorageManagerFactory {
public static LogicalStorageManager getBlockStorageManager() {
//return new LVM2Manager();
<<<<<<< HEAD
return new SANManager();
=======
//TODO: make this configurable
return new LVM2DASManager();
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
}
} |
| Solution content |
|---|
public class BlockStorageManagerFactory {
public static LogicalStorageManager getBlockStorageManager() {
//TODO: make this configurable
//return new LVM2Manager();
return new SANManager();
//return new LVM2DASManager();
}
} |
| File |
|---|
| BlockStorageManagerFactory.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
{
this.clusterList.add (new ClusterInfoWeb ("cluster-name", "cc-host", 8774, 10, 4096));
//these values are just defaults
<<<<<<< HEAD
this.storageList.add (new StorageInfoWeb("sc-name", "sc-host", 8773, "/var/lib/eucalyptus/volumes", 10, 50, "eth0", false, "sanHost", "sanUser", "sanPassword"));
=======
this.storageList.add (new StorageInfoWeb("sc-name", "sc-host", 8773, "/var/lib/eucalyptus/volumes", 10, 50, "eth0", false, "/dev/null"));
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
this.rebuildTable();
this.statusLabel.setText ("Unsaved changes");
this.statusLabel.setStyleName ("euca-greeting-warning"); |
| Solution content |
|---|
{
this.clusterList.add (new ClusterInfoWeb ("cluster-name", "cc-host", 8774, 10, 4096));
//these values are just defaults
this.storageList.add (new StorageInfoWeb("sc-name", "sc-host", 8773, "/var/lib/eucalyptus/volumes", 10, 50, "eth0", false, "sanHost", "sanUser", "sanPassword", "/dev/blockdev"));
this.rebuildTable();
this.statusLabel.setText ("Unsaved changes");
this.statusLabel.setStyleName ("euca-greeting-warning"); |
| File |
|---|
| ClusterInfoTable.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
private Grid addClusterEntry ( int row, ClusterInfoWeb clusterInfo, final StorageInfoWeb storageInfo)
{
<<<<<<< HEAD
Grid g = new Grid (18, 2);
=======
Grid g = new Grid (16, 2);
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
g.setStyleName( "euca-table" );
if (row > 0) {
g.setStyleName( "euca-nonfirst-cluster-entry" ); |
| Solution content |
|---|
private Grid addClusterEntry ( int row, ClusterInfoWeb clusterInfo, final StorageInfoWeb storageInfo)
{
Grid g = new Grid (18, 2);
g.setStyleName( "euca-table" );
if (row > 0) {
g.setStyleName( "euca-nonfirst-cluster-entry" ); |
| File |
|---|
| ClusterInfoTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
g.setWidget( i, 1, new Label ("Zero-fill volumes") );
i++; // next row
<<<<<<< HEAD
g.setWidget( i, 0, new Label( "SAN Host:" ) );
g.getCellFormatter().setHorizontalAlignment(i, 0, HasHorizontalAlignment.ALIGN_RIGHT);
final TextBox sanHostTextBox = new TextBox();
sanHostTextBox.addChangeListener (new ChangeCallback (this, row));
sanHostTextBox.setVisibleLength( 30 );
sanHostTextBox.setText( storageInfo.getSanHost() );
sanHostTextBox.addFocusListener (new FocusHandler (this.hint, this.warningMessage));
g.setWidget( i, 1, sanHostTextBox );
i++; // next row
g.setWidget( i, 0, new Label( "SAN User Name:" ) );
g.getCellFormatter().setHorizontalAlignment(i, 0, HasHorizontalAlignment.ALIGN_RIGHT);
final TextBox sanUserBox = new TextBox();
sanUserBox.addChangeListener (new ChangeCallback (this, row));
sanUserBox.setVisibleLength( 30 );
sanUserBox.setText( storageInfo.getSanUser() );
sanUserBox.addFocusListener (new FocusHandler (this.hint, this.warningMessage));
g.setWidget( i, 1, sanUserBox );
i++; // next row
g.setWidget( i, 0, new Label( "SAN Password:" ) );
g.getCellFormatter().setHorizontalAlignment(i, 0, HasHorizontalAlignment.ALIGN_RIGHT);
final PasswordTextBox sanPasswordBox = new PasswordTextBox();
sanPasswordBox.addChangeListener (new ChangeCallback (this, row));
sanPasswordBox.setVisibleLength( 30 );
sanPasswordBox.setText( storageInfo.getSanPassword() );
sanPasswordBox.addFocusListener (new FocusHandler (this.hint, this.warningMessage));
g.setWidget( i, 1, sanPasswordBox );
=======
g.setWidget( i, 0, new Label( "DAS Partition:" ) );
g.getCellFormatter().setHorizontalAlignment(i, 0, HasHorizontalAlignment.ALIGN_RIGHT);
final TextBox dasPartitionBox = new TextBox();
dasPartitionBox.addChangeListener (new ChangeCallback (this, row));
dasPartitionBox.setVisibleLength( 5 );
dasPartitionBox.setText( "" + storageInfo.getDASPartition());
dasPartitionBox.addFocusListener (new FocusHandler (this.hint, this.warningMessage));
g.setWidget( i, 1, dasPartitionBox );
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
return g;
} |
| Solution content |
|---|
g.setWidget( i, 1, new Label ("Zero-fill volumes") );
i++; // next row
g.setWidget( i, 0, new Label( "SAN Host:" ) );
g.getCellFormatter().setHorizontalAlignment(i, 0, HasHorizontalAlignment.ALIGN_RIGHT);
final TextBox sanHostTextBox = new TextBox();
sanHostTextBox.addChangeListener (new ChangeCallback (this, row));
sanHostTextBox.setVisibleLength( 30 );
sanHostTextBox.setText( storageInfo.getSanHost() );
sanHostTextBox.addFocusListener (new FocusHandler (this.hint, this.warningMessage));
g.setWidget( i, 1, sanHostTextBox );
i++; // next row
g.setWidget( i, 0, new Label( "SAN User Name:" ) );
g.getCellFormatter().setHorizontalAlignment(i, 0, HasHorizontalAlignment.ALIGN_RIGHT);
final TextBox sanUserBox = new TextBox();
sanUserBox.addChangeListener (new ChangeCallback (this, row));
sanUserBox.setVisibleLength( 30 );
sanUserBox.setText( storageInfo.getSanUser() );
sanUserBox.addFocusListener (new FocusHandler (this.hint, this.warningMessage));
g.setWidget( i, 1, sanUserBox );
i++; // next row
g.setWidget( i, 0, new Label( "SAN Password:" ) );
g.getCellFormatter().setHorizontalAlignment(i, 0, HasHorizontalAlignment.ALIGN_RIGHT);
final PasswordTextBox sanPasswordBox = new PasswordTextBox();
sanPasswordBox.addChangeListener (new ChangeCallback (this, row));
sanPasswordBox.setVisibleLength( 30 );
sanPasswordBox.setText( storageInfo.getSanPassword() );
sanPasswordBox.addFocusListener (new FocusHandler (this.hint, this.warningMessage));
g.setWidget( i, 1, sanPasswordBox );
/*g.setWidget( i, 0, new Label( "DAS Partition:" ) );
g.getCellFormatter().setHorizontalAlignment(i, 0, HasHorizontalAlignment.ALIGN_RIGHT);
final TextBox dasPartitionBox = new TextBox();
dasPartitionBox.addChangeListener (new ChangeCallback (this, row));
dasPartitionBox.setVisibleLength( 5 );
dasPartitionBox.setText( "" + storageInfo.getDASPartition());
dasPartitionBox.addFocusListener (new FocusHandler (this.hint, this.warningMessage));
g.setWidget( i, 1, dasPartitionBox );*/
return g;
} |
| File |
|---|
| ClusterInfoTable.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
storage.setMaxVolumeSizeInGB (Integer.parseInt(((TextBox)p.getWidget(0)).getText())); p = (HorizontalPanel)g.getWidget(13, 1); storage.setTotalVolumesSizeInGB((Integer.parseInt(((TextBox)p.getWidget(0)).getText()))); <<<<<<< HEAD storage.setSanHost (((TextBox)g.getWidget(15, 1)).getText()); storage.setSanUser (((TextBox)g.getWidget(16, 1)).getText()); storage.setSanPassword (((TextBox)g.getWidget(17, 1)).getText()); ======= storage.setDASPartition(((TextBox)g.getWidget(15, 1)).getText()); >>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b // systemConfig.setDoDynamicPublicAddresses( !((TextBox)p.getWidget(0)).isEnabled() ? true : false ); } |
| Solution content |
|---|
storage.setMaxVolumeSizeInGB (Integer.parseInt(((TextBox)p.getWidget(0)).getText())); p = (HorizontalPanel)g.getWidget(13, 1); storage.setTotalVolumesSizeInGB((Integer.parseInt(((TextBox)p.getWidget(0)).getText()))); storage.setSanHost (((TextBox)g.getWidget(15, 1)).getText()); storage.setSanUser (((TextBox)g.getWidget(16, 1)).getText()); storage.setSanPassword (((TextBox)g.getWidget(17, 1)).getText()); //storage.setDASPartition(((TextBox)g.getWidget(15, 1)).getText()); // systemConfig.setDoDynamicPublicAddresses( !((TextBox)p.getWidget(0)).isEnabled() ? true : false ); } |
| File |
|---|
| ClusterInfoTable.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
Integer totalVolumesSizeInGB,
String storageInterface,
Boolean zeroFillVolumes,
<<<<<<< HEAD
String sanHost,
String sanUser,
String sanPassword) {
=======
String DASPartition) {
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
this.name = name;
this.host = host;
this.port = port; |
| Solution content |
|---|
Integer totalVolumesSizeInGB,
String storageInterface,
Boolean zeroFillVolumes,
String sanHost,
String sanUser,
String sanPassword,
String DASDevice) {
this.name = name;
this.host = host;
this.port = port; |
| File |
|---|
| StorageInfoWeb.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
this.totalVolumesSizeInGB = totalVolumesSizeInGB; this.storageInterface = storageInterface; this.zeroFillVolumes = zeroFillVolumes; <<<<<<< HEAD this.sanHost = sanHost; this.sanUser = sanUser; this.sanPassword = sanPassword; ======= this.DASPartition = DASPartition; >>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b this.committed = false; } |
| Solution content |
|---|
this.totalVolumesSizeInGB = totalVolumesSizeInGB; this.storageInterface = storageInterface; this.zeroFillVolumes = zeroFillVolumes; this.sanHost = sanHost; this.sanUser = sanUser; this.sanPassword = sanPassword; this.DASDevice = DASDevice; this.committed = false; } |
| File |
|---|
| StorageInfoWeb.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
this.zeroFillVolumes = zeroFillVolumes;
}
<<<<<<< HEAD
public String getSanHost() {
return sanHost;
}
public void setSanHost(String sanHost) {
this.sanHost = sanHost;
}
public String getSanUser() {
return sanUser;
}
public void setSanUser(String sanUser) {
this.sanUser = sanUser;
}
public String getSanPassword() {
return sanPassword;
}
public void setSanPassword(String sanPassword) {
this.sanPassword = sanPassword;
=======
public String getDASPartition() {
return DASPartition;
}
public void setDASPartition(String dASPartition) {
DASPartition = dASPartition;
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
}
@Override |
| Solution content |
|---|
this.zeroFillVolumes = zeroFillVolumes;
}
public String getSanHost() {
return sanHost;
}
public void setSanHost(String sanHost) {
this.sanHost = sanHost;
}
public String getSanUser() {
return sanUser;
}
public void setSanUser(String sanUser) {
this.sanUser = sanUser;
}
public String getSanPassword() {
return sanPassword;
}
public void setSanPassword(String sanPassword) {
this.sanPassword = sanPassword;
}
public String getDASDevice() {
return DASDevice;
}
public void setDASDevice(String DASDevice) {
this.DASDevice = DASDevice;
}
@Override |
| File |
|---|
| StorageInfoWeb.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Method declaration |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
return name.hashCode(); } <<<<<<< HEAD public static StorageInfoWeb DEFAULT_SC = new StorageInfoWeb( "sc-name", "sc-host", 8773, "/var/lib/eucalyptus/volumes", 10, 50, "eth0", false, "sanhost", "sanuser", "sanpassword"); ======= public static StorageInfoWeb DEFAULT_SC = new StorageInfoWeb( "sc-name", "sc-host", 8773, "/var/lib/eucalyptus/volumes", 10, 50, "eth0", false, "/dev/null"); >>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b } |
| Solution content |
|---|
return name.hashCode(); } public static StorageInfoWeb DEFAULT_SC = new StorageInfoWeb( "sc-name", "sc-host", 8773, "/var/lib/eucalyptus/volumes", 10, 50, "eth0", false, "sanhost", "sanuser", "sanpassword", "/dev/blockdev"); } |
| File |
|---|
| StorageInfoWeb.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
updateStorageConfiguration.setStorageInterface(storageControllerWeb.getStorageInterface());
updateStorageConfiguration.setStorageRootDirectory(storageControllerWeb.getVolumesPath());
updateStorageConfiguration.setZeroFillVolumes(storageControllerWeb.getZeroFillVolumes());
<<<<<<< HEAD
updateStorageConfiguration.setSanHost(storageControllerWeb.getSanHost());
updateStorageConfiguration.setSanUser(storageControllerWeb.getSanUser());
updateStorageConfiguration.setSanPassword(storageControllerWeb.getSanPassword());
=======
updateStorageConfiguration.setDASPartition(storageControllerWeb.getDASPartition());
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
ServiceDispatcher scDispatch = ServiceDispatcher.lookup(Component.storage,
storageControllerWeb.getHost());
if(Component.eucalyptus.isLocal()) { |
| Solution content |
|---|
updateStorageConfiguration.setStorageInterface(storageControllerWeb.getStorageInterface());
updateStorageConfiguration.setStorageRootDirectory(storageControllerWeb.getVolumesPath());
updateStorageConfiguration.setZeroFillVolumes(storageControllerWeb.getZeroFillVolumes());
updateStorageConfiguration.setSanHost(storageControllerWeb.getSanHost());
updateStorageConfiguration.setSanUser(storageControllerWeb.getSanUser());
updateStorageConfiguration.setSanPassword(storageControllerWeb.getSanPassword());
updateStorageConfiguration.setDASDevice(storageControllerWeb.getDASDevice());
ServiceDispatcher scDispatch = ServiceDispatcher.lookup(Component.storage,
storageControllerWeb.getHost());
if(Component.eucalyptus.isLocal()) { |
| File |
|---|
| RemoteInfoHandler.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
scInfo.setTotalVolumesSizeInGB( getStorageConfigResponse.getMaxTotalVolumeSize( ) );
scInfo.setStorageInterface( getStorageConfigResponse.getStorageInterface( ) );
scInfo.setZeroFillVolumes( getStorageConfigResponse.getZeroFillVolumes( ) );
<<<<<<< HEAD
scInfo.setSanHost(getStorageConfigResponse.getSanHost());
scInfo.setSanUser(getStorageConfigResponse.getSanUser());
scInfo.setSanPassword(getStorageConfigResponse.getSanPassword());
=======
scInfo.setDASPartition(getStorageConfigResponse.getDASPartition());
>>>>>>> 32d4231a4285b349a1da562a25926df60f76fa6b
} else {
LOG.debug("Unexpected storage controller name: " + getStorageConfigResponse.getName( ), new Exception());
LOG.debug("Expected configuration for SC related to CC: " + LogUtil.dumpObject( c ) ); |
| Solution content |
|---|
scInfo.setTotalVolumesSizeInGB( getStorageConfigResponse.getMaxTotalVolumeSize( ) );
scInfo.setStorageInterface( getStorageConfigResponse.getStorageInterface( ) );
scInfo.setZeroFillVolumes( getStorageConfigResponse.getZeroFillVolumes( ) );
scInfo.setSanHost(getStorageConfigResponse.getSanHost());
scInfo.setSanUser(getStorageConfigResponse.getSanUser());
scInfo.setSanPassword(getStorageConfigResponse.getSanPassword());
scInfo.setDASDevice(getStorageConfigResponse.getDASDevice());
} else {
LOG.debug("Unexpected storage controller name: " + getStorageConfigResponse.getName( ), new Exception());
LOG.debug("Expected configuration for SC related to CC: " + LogUtil.dumpObject( c ) ); |
| File |
|---|
| RemoteInfoHandler.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |