summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.core
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge commit 'upstream/master'Dhandapani2011-04-075-84/+85
|\ | | | | | | | | | | Conflicts: src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
| * Merge branch 'alerts-review'Selvam2011-04-075-83/+85
| |\ | | | | | | | | | | | | | | | | | | Reviews: 1. Code formatted to 120 column per line 2. Unused Parameter fixed 3. Removed unnecessary method
| | * Alerts and running task UI stories review updatesShireesh Anjal2011-04-064-28/+39
| | |
* | | Merge commit 'upstream/master'Dhandapani2011-04-0722-81/+479
|\| | | | | | | | | | | | | | | | | Conflicts: src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
| * | Story #15 - Volume Options View - REST resource changesShireesh Anjal2011-04-052-22/+33
| |/
| * Merge branch 'master' of github.com:Selvasundaram/consoleSelvam2011-04-051-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AlertsClient.java src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AlertListResponse.java src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/RunningTask.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
| | * Alerts section in volumes summary pageSelvam2011-03-307-7/+129
| | |
| * | Merge remote branch 'upstream/master'Selvam2011-04-0511-8/+99
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
| | * | Story# 15 - Volume Options view. Also moved response classes from model ↵Shireesh Anjal2011-04-059-7/+93
| | |/ | | | | | | | | | package to a separate package
| * / Alerts section in volumes summary pageSelvam2011-04-0513-77/+377
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volumes update in navigation tree Review comments update for Alerts & Running tasks 1. RESOURCE_NAME removed and used RESTConstants 2. fetchAlerts renamed to fetchAllAlerts 3. System.out.println removed 4. ALERT_TYPE_STR made as static and final 5. getAlertDescription renamed as getMessage 6. getTaskDescription renamed as getTaskInfo 7. getCluster method is added in GlusterDataModel 8. getRunningTasksForVolumesContext will not implemented for Volumes summary view 9. Constants added for "Availability", "Running Tasks" etc. 10. CPU_USAGE_ALERT, MEMORY_USAGE_ALERT and DISK_USAGE_ALERT are modifies and OFFLINE_VOLUME_DISKS_ALERT, OFFLINE_SERVERS_ALERT are added. 11. Two more dummy alerts added 12. Reference format changed for Disk as "volumeName:serverName:diskName" 13. TaskInfo reflects the task type 14. Method removeSpaces added as static method 15. Local constants added for package and Manager
* / Volume re-export directory creation task in remote serversDhandapani2011-04-071-23/+3
|/
* Preparing src for migration to githubShireesh Anjal2011-03-2849-0/+3895