summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #60 from Dhandapani/masterShireesh Anjal2011-06-084-62/+76
|\
| * Merge branch 'fixes'Dhandapani2011-06-081-56/+21
| |\
| | * Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-06-0812-126/+280
| | |\ | |_|/ |/| |
| * | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-06-0811-70/+259
| |\ \ | |/ / |/| / | |/
* | Merge branch 'volume-logs'Shireesh Anjal2011-06-073-10/+20
|\ \
| * | add/remove serverShireesh Anjal2011-06-0710-62/+253
* | | add/remove serverShireesh Anjal2011-06-077-52/+233
|/ /
* | Merge pull request #59 from Selvasundaram/masterShireesh Anjal2011-06-072-8/+6
|\ \
| * | Remove server / Add server issue fixselvam2011-06-072-8/+6
|/ /
| * Bug 2881 - "Add" button should get disabled once all the Volume options are s...Dhandapani2011-06-081-45/+103
| * Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-06-074-8/+27
| |\ | |/ |/|
* | Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-061-2/+1
* | Merge branch 'volume-logs'Shireesh Anjal2011-06-060-0/+0
|\ \
| * | Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-064-9/+28
* | | Merge branch 'volume-logs'Shireesh Anjal2011-06-061-1/+2
|\ \ \
| * | | Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-065-10/+30
| |/ /
* / / Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-064-9/+28
|/ /
| * Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-06-067-85/+140
| |\ | |/ |/|
* | Merge remote branch 'dh/master' into dh-masterShireesh Anjal2011-06-0614-59/+71
|\ \
| * | UI Changes - Disk to brick label changesDhandapani2011-06-0614-60/+72
* | | Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-066-88/+140
|/ /
| * UI Changes - Disk to brick label changesDhandapani2011-06-0614-73/+73
|/
* Merge branch 'volume-logs'Shireesh Anjal2011-06-031-1/+1
|\
| * Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-034-4/+41
* | Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-033-3/+40
|/
* Merge pull request #57 from TimothyAsir/masterShireesh Anjal2011-06-033-1/+158
|\
| * Updated get_server_details.py to refresh HAL to get all the disk details incl...Tim2011-06-031-1/+9
| * Added functionalities to get and update cpu details into rrdTim2011-06-032-0/+149
|/
* Merge pull request #56 from TimothyAsir/masterShireesh Anjal2011-06-031-4/+4
|\
| * Updated get_server_details.py to return disk size in GiB.Tim2011-06-031-4/+4
* | Merge branch 'volume-logs'Shireesh Anjal2011-06-033-5/+42
|\ \ | |/ |/|
| * Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-033-6/+43
* | Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-031-1/+1
|/
* Merge pull request #55 from TimothyAsir/masterShireesh Anjal2011-06-032-8/+7
|\
| * Enhanced multicast_response.py and Fixed to many files open error.Tim2011-06-032-8/+7
|/
* Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-032-8/+29
* Merge pull request #54 from Selvasundaram/masterShireesh Anjal2011-06-031-1/+1
|\
| * Brick view (UI) updates the Add / remove brickselvam2011-06-031-1/+1
|/
* Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-032-15/+34
* Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-038-37/+70
* Merge pull request #53 from Dhandapani/masterShireesh Anjal2011-06-034-15/+27
|\
| * Merge branch 'fixes'Dhandapani2011-06-034-15/+27
| |\
| | * Remove Brick issuesDhandapani2011-06-034-15/+27
| | * Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-06-0310-38/+112
| | |\ | |_|/ |/| |
* | | Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-028-27/+51
* | | Merge pull request #52 from Selvasundaram/masterShireesh Anjal2011-06-024-4/+26
|\ \ \
| * | | Remove server REST path issue fixselvam2011-06-024-4/+26
|/ / /
* | | Design changes - introducing cluster-server mapping on gatewayShireesh Anjal2011-06-021-10/+38
* | | Merge pull request #51 from Dhandapani/cf34dac4146517b02fe8da81b6aeaa0007161f83Shireesh Anjal2011-06-025-15/+55
|\ \ \
| | | * Merge branch 'fixes'Dhandapani2011-06-025-15/+55
| |_|/| |/| |/ | |/|