Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: cfccbd13a8
...
compare: 98a7bf420d
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Feb 28, 2012
@Dhandapani Conflicts resolved
Conflicts:
	backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommand.java
	backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/GlusterConstants.java
	backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/glusteractions/GlusterVolumeReplaceBrickParameters.java
	backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/glustercommands/ReplaceGlusterVolumeBrickVDSParameters.java
	backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGlusterVolumeResource.java
	backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/glusterbroker/ReplaceGlusterVolumeBrickVDSCommand.java
50b996d
@Dhandapani conflicts resolved
Conflicts:
	backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/glusteractions/GlusterVolumeReplaceBrickParameters.java
98a7bf4
View
4 ...ommon/src/main/java/org/ovirt/engine/core/common/glusteractions/GlusterVolumeReplaceBrickParameters.java
@@ -1,11 +1,7 @@
package org.ovirt.engine.core.common.glusteractions;
import org.ovirt.engine.core.common.businessentities.GlusterBrickEntity;
-<<<<<<< HEAD
import org.ovirt.engine.core.common.constants.GlusterConstants.GLUSTER_TASK_OPERATION;
-=======
-import org.ovirt.engine.core.common.constants.GlusterConstants.VOLUME_OPERATION;
->>>>>>> a502934177dd603f83b8e3e1c41b8e91e3968a98
import org.ovirt.engine.core.compat.Guid;
public class GlusterVolumeReplaceBrickParameters extends GlusterVolumeParameters {

No commit comments for this range

Something went wrong with that request. Please try again.