summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of github.com:Selvasundaram/console into ssShireesh Anjal2011-07-273-19/+25
|\
| * Merge branch 'bugs'Selvasundaram2011-07-273-19/+25
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
| | * Auto resize the Alerts and Tasks section upon refreshSelvasundaram2011-07-273-47/+44
| | |
* | | Story #29 - Memory Usage GraphShireesh Anjal2011-07-278-266/+212
|/ /
* | Merge pull request #158 from Selvasundaram/masterShireesh Anjal2011-07-2716-118/+302
|\ \ | | | | | | Alerts, Running tasks and Chart refresh on all views
| * | Merge branch 'bugs'Selvasundaram2011-07-274-1/+1
| |\|
| | * New icons for running tasks and onlineSelvasundaram2011-07-274-1/+1
| | |
| * | Merge branch 'master' of github.com:Selvasundaram/consoleSelvasundaram2011-07-271-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
| | * Alerts, Running tasks and Chart refresh on all viewsSelvasundaram2011-07-2713-117/+310
| |/ |/| | | | | | | Password icons removed [Bug 3265] Adding an already added server throws error message - hostname validation fix
| * Alerts, Running tasks and Chart refresh on all viewsSelvasundaram2011-07-2713-117/+302
|/ | | | | Password icons removed [Bug 3265] Adding an already added server throws error message - hostname validation fix
* Exception mapper that converts exceptions into appropriate REST responses.Shireesh Anjal2011-07-271-0/+54
|
* Merge pull request #157 from TimothyAsir/masterShireesh Anjal2011-07-272-5/+12
|\ | | | | Updated format_device.py to throw exception while trying format device in AMI instance.
| * Merge remote branch 'upstream/master'Tim2011-07-2780-348/+85231
| |\ | |/ |/|
* | Story #29 - Memory Usage GraphShireesh Anjal2011-07-265-12/+362
| |
* | Merge pull request #156 from Selvasundaram/masterShireesh Anjal2011-07-262-3/+21
|\ \ | | | | | | White space character validation added for change password feature.
| * \ Merge branch 'master' of github.com:gluster/consoleSelvasundaram2011-07-2669-193/+84779
| |\ \ | |/ / |/| |
* | | Merge pull request #155 from Dhandapani/masterShireesh Anjal2011-07-2656-0/+84591
|\ \ \ | | | | | | | | Volume icons enhancement
| * | | Volume icons enhancementDhandapani2011-07-2656-0/+84591
| | | | | | | | | | | | | | | | .svg images are kept under the scalable folder
| * | | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-07-2621-361/+280
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'work'Shireesh Anjal2011-07-261-2/+6
|\ \ \ \
| * | | | Story #38 - CPU Usage graphShireesh Anjal2011-07-2611-165/+165
| | | | |
* | | | | Story #38 - CPU Usage graphShireesh Anjal2011-07-2611-163/+159
|/ / / /
* | | | Merge pull request #154 from TimothyAsir/masterShireesh Anjal2011-07-262-28/+23
|\ \ \ \ | | | | | | | | | | Fixed bug in calculating cpu usage and cpu load.
* \ \ \ \ Merge pull request #153 from Selvasundaram/masterShireesh Anjal2011-07-268-168/+92
|\ \ \ \ \ | | | | | | | | | | | | Export key errors - bug fix
| | | * \ \ Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-07-260-0/+0
| | | |\ \ \ | |_|_|/ / / |/| | | | |
| | | * | | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-07-262-11/+11
| | | |\ \ \
| | | | | * | White space character validation added for change password feature.Selvasundaram2011-07-261-1/+9
| | | | | | |
| | | | | * | Bug 3048 - Added brick does not show proper free & total space. - fixSelvasundaram2011-07-261-2/+12
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'bugs'Selvasundaram2011-07-268-168/+92
|/| | | | |
| * | | | | Volume download logs REST services enhancedSelvasundaram2011-07-265-71/+36
| | | | | |
| * | | | | Export key errors - bug fixSelvasundaram2011-07-265-105/+64
| | | | | |
| | | | | * Updated format_device.py to throw exception while trying format device in ↵Tim2011-07-272-5/+12
| | | |_|/ | | |/| | | | | | | | | | | | AMI instance.
| | * | | Added function to get average cpu usage and fixed bug in getCpuUsageAvg() ↵Tim2011-07-262-28/+23
| |/ / / |/| | | | | | | | | | | function
* | | | Merge pull request #152 from Dhandapani/e0d5835c21c83e6a99a3df0a3e044617b41ace2eShireesh Anjal2011-07-262-0/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | Bug 3204 - Total Disk Space showing 0.00 GB
| * | Bug 3204 - Total Disk Space showing 0.00 GBDhandapani2011-07-261-0/+1
| | |
| * | Bug 3249 - "widget disposed" error pops up after any action which needs to ↵Dhandapani2011-07-261-0/+1
| | | | | | | | | | | | redraw the view
* | | Story #38 - CPU Usage graphShireesh Anjal2011-07-262-11/+11
| | |
* | | Merge pull request #151 from Dhandapani/masterShireesh Anjal2011-07-261-1/+0
|\| | | |/ |/| Bug 3249 - "widget disposed" error pops up after any action which needs to redraw the view
| * Bug 3249 - "widget disposed" error pops up after any action which needs to ↵Dhandapani2011-07-261-1/+0
|/ | | | redraw the view
* Merge branch 'master' of github.com:anjalshireesh/consoleShireesh Anjal2011-07-250-0/+0
|\ | | | | | | | | Conflicts: src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
| * Story #38 - CPU Usage graphShireesh Anjal2011-07-256-80/+236
| |
* | Story #38 - CPU Usage graphShireesh Anjal2011-07-256-80/+236
|/
* Merge pull request #148 from Dhandapani/masterShireesh Anjal2011-07-258-59/+144
|\ | | | | NFS volume Enable/Disable feature
| * Merge branch 'master' of git@github.com:Dhandapani/consoleDhandapani2011-07-252-1/+38
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.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/views/VolumeSummaryView.java src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
| | * NFS volume Enable/Disable featureDhandapani2011-07-257-56/+148
| | |
| * | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-07-252-12/+40
| |\ \
| * | | NFS volume Enable/Disable featureDhandapani2011-07-258-59/+107
| | |/ | |/|
* | | Merge pull request #150 from Selvasundaram/masterShireesh Anjal2011-07-254-2/+53
|\ \ \ | |_|/ |/| | Filtering offline server disks for create volume
| * | Merge branch 'master' of github.com:gluster/consoleSelvasundaram2011-07-251-5/+26
| |\ \ | |/ / |/| |
* | | Story #38 - CPU Usage graphShireesh Anjal2011-07-251-5/+26
| | |