diff options
| author | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-08-11 02:27:23 -0700 |
|---|---|---|
| committer | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-08-11 02:27:23 -0700 |
| commit | ad33634ec83488504719b0dcda41763925654331 (patch) | |
| tree | 540a098a40a85937f38d1e51f94410e86fd97365 /src | |
| parent | a58049ad9568bcede5a65ab867b0c6af2cae265b (diff) | |
| parent | 4dde38ff783615d1a4927775ac40016945dc4af8 (diff) | |
Merge pull request #224 from Dhandapani/master
REST API changes
Diffstat (limited to 'src')
2 files changed, 5 insertions, 1 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java index 97b83f70..b4bd7c15 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java @@ -32,7 +32,7 @@ public class RESTConstants { // REST Resource names public static final String RESOURCE_VOLUMES = "volumes"; - public static final String RESOURCE_DEFAULT_OPTIONS = "defaultoptions"; + public static final String RESOURCE_DEFAULT_OPTIONS = "options"; public static final String RESOURCE_OPTIONS = "options"; public static final String RESOURCE_LOGS = "logs"; public static final String RESOURCE_DOWNLOAD = "download"; diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java index 0bd1b4ce..bdb81a7f 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java @@ -414,6 +414,10 @@ public class VolumeService { if (clusterService.getCluster(clusterName) == null) { throw new GlusterValidationException("Cluster [" + clusterName + "] not found!"); } + + if (lineCount == null || lineCount == 0) { + lineCount = 100; + } List<VolumeLogMessage> logMessages = null; Volume volume = getVolume(clusterName, volumeName); |