diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-07-18 11:39:27 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-07-18 11:39:27 +0530 |
| commit | 258966e92fcbd101f28d54e7c852364f210704d9 (patch) | |
| tree | 52ee6f31c33fb08c45661ea313547f06d32a1e69 /src/com.gluster.storage.management.gui.feature | |
| parent | b4f1bd556d85e3638989200867c42219e114bc72 (diff) | |
| parent | 4290f5519fb7480df6c5919583efc1f7feebf4b3 (diff) | |
Merge branch 'master' of git@github.com:gluster/console
Conflicts:
src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickPage.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractTableTreeViewerPage.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/DisksPage.java
Diffstat (limited to 'src/com.gluster.storage.management.gui.feature')
| -rw-r--r-- | src/com.gluster.storage.management.gui.feature/feature.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.gui.feature/feature.xml b/src/com.gluster.storage.management.gui.feature/feature.xml index 0f0c9e8b..7f526f72 100644 --- a/src/com.gluster.storage.management.gui.feature/feature.xml +++ b/src/com.gluster.storage.management.gui.feature/feature.xml @@ -538,7 +538,7 @@ id="org.eclipse.core.net.win32.x86_64" os="win32" ws="win32" - arch="x86_64" + arch="x86_64, amd64" download-size="0" install-size="0" version="0.0.0" @@ -609,7 +609,7 @@ <plugin id="org.eclipse.equinox.launcher.win32.win32.x86" - os="win32" + os="Windows XP, Windows 7" ws="win32" arch="x86" download-size="0" |