summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #166 from TimothyAsir/masterShireesh Anjal2011-07-2915-16/+497
|\
| * Added functionalities to support CIFS.Tim2011-07-2913-1/+473
| * Bug fixed in rrd network usageTim2011-07-292-15/+24
| * Merge remote branch 'upstream/master'Tim2011-07-290-0/+0
| |\ | |/ |/|
* | Merge pull request #165 from TimothyAsir/masterShireesh Anjal2011-07-291-3/+12
|\ \
| * | Fixed bug while resolving server ip address.Tim2011-07-291-3/+12
|/ /
| * Fixed bug while resolving server ip address.Tim2011-07-291-3/+12
|/
* Story #29 - Memory Usage GraphShireesh Anjal2011-07-289-65/+57
* Merge pull request #164 from Dhandapani/masterShireesh Anjal2011-07-282-36/+3
|\
| * Bug 3258 - GUI shows as NFS off even though it's on when the volume created f...Dhandapani2011-07-282-36/+3
| * Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-07-282-55/+86
| |\ | |/ |/|
* | Merge pull request #163 from TimothyAsir/masterShireesh Anjal2011-07-281-12/+30
|\ \
| * \ Merge remote branch 'upstream/master'Tim2011-07-286-30/+135
| |\ \
| * | | Added function to get ipaddress, netmask and gateway in case of DHCP is usedTim2011-07-281-12/+30
* | | | Merge pull request #162 from Selvasundaram/masterShireesh Anjal2011-07-281-43/+56
|\ \ \ \
| * | | | Server summary section updates while refresh UISelvasundaram2011-07-281-43/+56
| | |/ / | |/| |
* | | | Merge pull request #160 from Dhandapani/masterShireesh Anjal2011-07-283-20/+36
|\ \ \ \ | |/ / / |/| | |
| | | * Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-07-282-5/+9
| | |/| | |/|/ | |/| |/| |
* | | Merge pull request #161 from Selvasundaram/masterShireesh Anjal2011-07-282-5/+9
|\ \ \
| * | | Bug 2885 - "Add" button gets disabled after resetting volume options with any...Selvasundaram2011-07-281-0/+2
| * | | Add only the online gluster servers to discovered servers while removingSelvasundaram2011-07-281-5/+7
|/ / /
| * | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-07-287-27/+132
| |\ \ | |/ / |/| |
* | | Story #29 - Memory Usage GraphShireesh Anjal2011-07-285-25/+126
| |/ |/|
| * Bug 3267 - Serve name entered in different case than the actual name could ca...Dhandapani2011-07-283-20/+32
|/
* Story #29 - Memory Usage GraphShireesh Anjal2011-07-271-14/+9
* Merge branch 'master' of github.com:Selvasundaram/console into ssShireesh Anjal2011-07-273-19/+25
|\
| * Merge branch 'bugs'Selvasundaram2011-07-273-19/+25
| |\
| | * 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
|\ \
| * | 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
| |\|
| | * Alerts, Running tasks and Chart refresh on all viewsSelvasundaram2011-07-2713-117/+310
| |/ |/|
| * Alerts, Running tasks and Chart refresh on all viewsSelvasundaram2011-07-2713-117/+302
|/
* 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
|\
| * 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
|\ \
| * \ 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 enhancementDhandapani2011-07-2656-0/+84591
| * | | 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
|\ \ \ \
* \ \ \ \ Merge pull request #153 from Selvasundaram/masterShireesh Anjal2011-07-268-168/+92
|\ \ \ \ \
| | | * \ \ Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-07-260-0/+0
| | | |\ \ \ | |_|_|/ / / |/| | | | |