diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-05-09 15:27:41 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-05-09 15:27:41 +0530 |
| commit | e7daa121d53d353670d1429f202505d66040df15 (patch) | |
| tree | ad32c0e8e9bcc2b144e618fbd78b386085311a83 /src | |
| parent | c0db2695f0979b400ebea561bccd72a8cd9aee75 (diff) | |
| parent | eef0d9d35a3f9ce033c4a579a10ecf34499f3df3 (diff) | |
Merge branch 'volume-logs'
Conflicts:
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java
Diffstat (limited to 'src')
2 files changed, 2 insertions, 0 deletions
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java index d8547644..88bbdf46 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java @@ -50,6 +50,7 @@ public class DownloadVolumeLogsAction extends AbstractActionDelegate { protected void performAction(IAction action) { final Volume volume = (Volume)selectedEntity; final VolumesClient client = new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken()); + Display.getDefault().asyncExec(new Runnable() { @Override diff --git a/src/com.gluster.storage.management.releng/gluster-management-console.target b/src/com.gluster.storage.management.releng/gluster-management-console.target index 6b44d70d..03c45b7c 100644 --- a/src/com.gluster.storage.management.releng/gluster-management-console.target +++ b/src/com.gluster.storage.management.releng/gluster-management-console.target @@ -7,6 +7,7 @@ <location path="target/com.gluster.storage.management.gui.target/richclientgui.rcptoolbox" type="Directory"/> <location path="target/com.gluster.storage.management.gui.target/birt.charts.helios" type="Directory"/> <location path="target/com.gluster.storage.management.gui.target/delta.pack.helios" type="Directory"/> +<location path="target/com.gluster.storage.management.gui.target/org.eclipse.help" type="Directory"/> </locations> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> </target> |