Merge remote-tracking branch 'upstream/master'

1 files changed, 18 insertions, 0 deletions

diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml
index e7c2c2d4..6983b9dd 100644
--- a/src/com.gluster.storage.management.console/plugin.xml
+++ b/src/com.gluster.storage.management.console/plugin.xml
@@ -302,6 +302,11 @@
             id="com.gluster.storage.management.console.commands.Preferences"
             name="Settings">
       </command>
+      <command
+            description="Volume Log Rotate"
+            id="com.gluster.storage.management.console.commands.LogRotate"
+            name="LogRotate">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">
@@ -521,6 +526,19 @@
             label="Volume Actions"
             visible="false">
          <action
+               class="com.gluster.storage.management.console.actions.VolumeLogRotateAction"
+               definitionId="com.gluster.storage.management.console.commands.LogRotate"
+               icon="icons/tango/32x32/download-log.png"
+               id="com.gluster.storage.management.console.actions.LogRotateAction"
+               label="L&amp;og Rotate"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               pulldown="false"
+               state="true"
+               style="push"
+               toolbarPath="Normal"
+               tooltip="Rotate the volume logs">
+         </action>
+         <action
                allowLabelUpdate="false"
                class="com.gluster.storage.management.console.actions.MigrateBrickAction"
                definitionId="com.gluster.storage.management.console.commands.MigrateDisk"