summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Removed unused method setColumnPropertiesShireesh Anjal2011-11-021-21/+0
| |/ /
* | | Merge pull request #295 from TimothyAsir/masterShireesh Anjal2011-11-041-6/+24
|\ \ \ | |/ / |/| | Fixed - Bug 3762 - Server details return irrelevant disk space
| * | Fixed - Bug 3762 - Server details return irrelevant disk spacetimothy2011-11-031-6/+24
|/ /
* | Merge pull request #292 from Dhandapani/masterShireesh Anjal2011-11-0214-34/+132
|\ \ | | | | | | Force start volume option implemented to start offline brick
| * \ Merge branch 'master' of git@github.com:Dhandapani/consoleDhandapani2011-11-020-0/+0
| |\ \
| | * \ Merge branch 'force-start-volume'Dhandapani2011-11-024-10/+10
| | |\ \
| * | \ \ Merge branch 'force-start-volume'Dhandapani2011-11-024-10/+10
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-11-027-18/+26
| | |\ \ | |_|/ / |/| | |
| * | | Merge branch 'master' of git@github.com:Dhandapani/consoleDhandapani2011-10-270-0/+0
| |\ \ \
| | * \ \ Merge branch 'master' of git@github.com:Dhandapani/consoleDhandapani2011-10-270-0/+0
| | |\ \ \
| * | \ \ \ Review comments incorporatedDhandapani2011-10-271-5/+7
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / Merge branch 'master' of git@github.com:Dhandapani/console
| | * | | Merge branch 'force-start-volume'Dhandapani2011-10-271-1/+1
| | |\ \ \
| * | \ \ \ Merge branch 'force-start-volume'Dhandapani2011-10-271-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-10-273-8/+16
| | |\ \ \ | |_|/ / / |/| | / / | | |/ /
| * | | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-10-202-7/+15
| |\ \ \ | |/ / / |/| / / | |/ /
* | | Merge pull request #291 from Selvasundaram/masterShireesh Anjal2011-10-192-7/+15
|\ \ \ | | | | | | | | Brick selection updates in migrate bricks dialog
| * | | Migrate brick dialog shows the source and target brick selection dynamically ↵Selvasundaram2011-10-142-7/+15
| | | | | | | | | | | | | | | | in the message.
| | * | Force start volume option implemented to start offline brickDhandapani2011-10-1914-34/+130
| | | |
| | * | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-10-190-0/+0
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #290 from Dhandapani/masterShireesh Anjal2011-10-1810-10/+38
|\ \ \ \ | |/ / / |/| | | | | | | | | | | UI Changes : - CPU/Memory/Disk Usage alerts set to 80% - Display Offline volumes in alert section
| | * | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-10-173-5/+10
| |/| | | |/ / |/| |
| * | Merge branch 'master' of git@github.com:Dhandapani/consoleDhandapani2011-10-130-0/+0
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java
| | * | UI ChangesDhandapani2011-10-1110-10/+41
| | | | | | | | | | | | | | | | | | | | - CPU/Memory/Disk Usage alerts set to 80% - Displayed Offline volumes in alert section
| * | | UI ChangesDhandapani2011-10-1310-10/+38
| |/ / | | | | | | | | | | | | - CPU/Memory/Disk Usage alerts set to 80% - Displayed Offline volumes in alert section
| | * Migrate brick dialog shows the source and target brick selection dynamically ↵Selvasundaram2011-11-077-7/+1124
| |/ |/| | | | | in the message.
* | Introduced ServerUtil#getBean to fetch Spring bean of given class.Shireesh Anjal2011-10-143-5/+10
|/
* Merge pull request #289 from Selvasundaram/masterShireesh Anjal2011-10-112-26/+17
|\ | | | | DateUtilTest Junit test failures fixed
| * Junit time zone failure fixSelvasundaram2011-10-112-26/+17
| |
* | Merge pull request #288 from TimothyAsir/masterShireesh Anjal2011-10-113-2/+10
|\ \ | |/ |/| Fixed bugs in NetworkUtils.py and get_server_details.py where some variables were not initialized before use.
| * Fixed bugs in NetworkUtils.py and get_server_details.py where some variables ↵Tim2011-10-102-2/+4
| | | | | | | | were not initialized before use.
| * Merge remote-tracking branch 'upstream/master'Tim2011-10-1055-373/+1960
| |\ | |/ |/|
* | Introducing mechanism for version specific interface to GlusterFSShireesh Anjal2011-10-1013-244/+1080
| |
* | Deleted redundant file TestFileUtil.java, introduced constants ↵Shireesh Anjal2011-10-072-84/+10
| | | | | | | | TEST_FILE_PATH and TEST_FILE_CONTENT in FileUtilTest.java
* | Merge pull request #286 from Selvasundaram/masterShireesh Anjal2011-10-064-0/+718
|\ \ | | | | | | Junit code for util
| * \ Merge branch 'master' of github.com:Selvasundaram/consoleSelvasundaram2011-10-032-9/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/DateUtilTest.java src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/FileUtilTest.java
| | * | Junit code for utilSelvasundaram2011-09-302-0/+647
| | | |
| * | | Merge branch 'master' of github.com:gluster/consoleSelvasundaram2011-10-0339-66/+173
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #287 from Dhandapani/masterShireesh Anjal2011-10-0333-68/+46
|\ \ \ \ | | | | | | | | | | Done code audit fixes on console project
| * | | | Done code audit fixes on console projectDhandapani2011-10-0333-68/+46
|/ / / /
* | | | Merge pull request #284 from Dhandapani/masterShireesh Anjal2011-10-017-1/+130
|\ \ \ \ | | | | | | | | | | Story #41: Volume Log Rotate
| * \ \ \ Merge branch 'master' of git@github.com:Dhandapani/consoleDhandapani2011-09-293-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java src/com.gluster.storage.management.console/plugin.xml src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
| | * | | | Story #41: Volume Log RotateDhandapani2011-09-287-1/+130
| | | | | |
| * | | | | Merge branch 'master' of git@github.com:gluster/consoleDhandapani2011-09-291-1/+1
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Story #41: Volume Log RotateDhandapani2011-09-297-1/+128
| |/ / / /
| | * / / Junit code for utilSelvasundaram2011-10-033-0/+719
| | |/ /
| | * | Merge branch 'master' of github.com:gluster/consoleSelvasundaram2011-09-303-429/+4
| | |\ \ | |_|/ / |/| | |
| | * | Merge branch 'master' of github.com:gluster/consoleSelvasundaram2011-09-2747-2089/+779
| | |\ \
| | * \ \ Merge branch 'master' of github.com:gluster/consoleSelvasundaram2011-09-2149-2607/+1160
| | |\ \ \
| | * \ \ \ Merge branch '1.0.0' of github.com:gluster/consoleSelvasundaram2011-09-0910-59/+56
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of github.com:gluster/consoleSelvasundaram2011-09-071-9/+14
| | |\ \ \ \ \