diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-04-11 14:05:20 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-04-11 14:05:20 +0530 |
| commit | 8e28b180eec30f2059977c20a83a8f2488e41788 (patch) | |
| tree | 3d4fbfd586d4675a3c80e2d594fdfb88980ff594 /src/com.gluster.storage.management.gui/META-INF | |
| parent | 49f755f886ce0b99c7e0f61d71eaee814ce5ae66 (diff) | |
| parent | 89211e6eb5996e1f18493d2a48696171b3693811 (diff) | |
Merge branch 'master' into volume-options
Conflicts:
src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
Diffstat (limited to 'src/com.gluster.storage.management.gui/META-INF')
| -rw-r--r-- | src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF index 2e59c854..13fb07dc 100644 --- a/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF +++ b/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF @@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.1", org.eclipse.birt.chart.device.swt;bundle-version="2.6.1", com.ibm.icu;bundle-version="4.2.1", com.richclientgui.rcptoolbox;bundle-version="1.0.5", - org.eclipse.core.resources + org.eclipse.core.resources, + org.eclipse.equinox.common.source;bundle-version="3.6.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . |