summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Added function to get average cpu usage and fixed bug in getCpuUsageAvg() fun...Tim2011-07-262-28/+23
* | Merge pull request #153 from Selvasundaram/masterShireesh Anjal2011-07-268-168/+92
|\ \ | |/ |/|
| * 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
* | Merge pull request #152 from Dhandapani/e0d5835c21c83e6a99a3df0a3e044617b41ace2eShireesh Anjal2011-07-262-0/+2
|\ \
| * | 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 re...Dhandapani2011-07-261-0/+1
* | | 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 re...Dhandapani2011-07-261-1/+0
|/
* Merge branch 'master' of github.com:anjalshireesh/consoleShireesh Anjal2011-07-250-0/+0
|\
| * 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
|\
| * Merge branch 'master' of git@github.com:Dhandapani/consoleDhandapani2011-07-252-1/+38
| |\
| | * 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
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' of github.com:gluster/consoleSelvasundaram2011-07-251-5/+26
| |\ \ | |/ / |/| |
* | | Story #38 - CPU Usage graphShireesh Anjal2011-07-251-5/+26
* | | Merge pull request #149 from Selvasundaram/masterShireesh Anjal2011-07-251-7/+14
|\ \ \ | |_|/ |/| |
| | * Filtering offline server disks for create volumeSelvasundaram2011-07-254-2/+53
| |/
| * Merge branch 'master' of github.com:gluster/consoleSelvasundaram2011-07-2515-224/+602
| |\ | |/ |/|
* | Story #38 - CPU Usage graphShireesh Anjal2011-07-252-61/+19
* | Merge branch 'master' of github.com:gluster/consoleShireesh Anjal2011-07-2415-62/+151
|\ \
| * \ Merge pull request #147 from Selvasundaram/masterShireesh Anjal2011-07-2410-37/+70
| |\ \
* | | | Story #38 - CPU Usage graphShireesh Anjal2011-07-2423-402/+694
| | | * "Initialize" link placed in wronk disk/partitions in disk view issue - fixSelvasundaram2011-07-251-7/+14
| | |/
| | * Bug 3061 - Volumes summary view is broken if brick for a volume is on differe...Selvasundaram2011-07-242-2/+9
| | * Export key file handling exceptions capturedSelvasundaram2011-07-241-6/+23
| | * Merge branch 'master' of github.com:gluster/consoleSelvasundaram2011-07-240-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #146 from Selvasundaram/masterShireesh Anjal2011-07-242-2/+4
| |\ \
| | | * Brick status updates and brick status icon changes in bricks viewSelvasundaram2011-07-248-29/+38
| | |/
| | * Old passowrd validation addedSelvasundaram2011-07-241-2/+1
| | * Alerts - Memory threshold field default initialization addedSelvasundaram2011-07-241-0/+3
| |/
| * Story #38 - CPU Usage graphShireesh Anjal2011-07-2411-198/+124
|/
* Merge pull request #145 from Selvasundaram/masterShireesh Anjal2011-07-2314-56/+53
|\
| * Merge branch 'bugs'Selvasundaram2011-07-2314-56/+53
| |\
| | * Gluster online status check includes glusterd statusSelvasundaram2011-07-2314-56/+53
* | | Merge pull request #144 from TimothyAsir/masterShireesh Anjal2011-07-232-3/+3
|\ \ \ | |/ / |/| |
| * | Fixed bug in updating and fetching rrd network detailsTim2011-07-232-3/+3
|/ /
* | Merge pull request #143 from Dhandapani/masterShireesh Anjal2011-07-23138-27601/+159
|\ \
| * | Icon changesDhandapani2011-07-23123-27602/+160
| * | svg icons converted to png and icons cleanupDhandapani2011-07-2317-1/+1
|/ /