diff options
| author | Selvam <selvam@gluster.com> | 2011-04-12 17:12:20 +0530 |
|---|---|---|
| committer | Selvam <selvam@gluster.com> | 2011-04-12 17:14:58 +0530 |
| commit | fa13d4c3807584cd9f7e690ed1b2c1377fc0b256 (patch) | |
| tree | bc7ef7114ce1fadaff564d469e6bdbc76e2415c3 /src/com.gluster.storage.management.core | |
| parent | 7cb60df3b751c43b30093aac10a170b9df26d44c (diff) | |
| parent | 491325d013f1b1b5ac033eac4ff8b1d565e669e8 (diff) | |
Merge branch 'master' of github.com:Selvasundaram/console
Conflicts:
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
Diffstat (limited to 'src/com.gluster.storage.management.core')
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java index fb7261ed..5ed83810 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java @@ -49,6 +49,7 @@ public class GlusterUtil { private static final String VOLUME_TRANSPORT_TYPE_PFX = "Transport-type:"; private static final String VOLUME_BRICKS_GROUP_PFX = "Bricks"; private static final String VOLUME_OPTIONS_RECONFIG_PFX = "Options Reconfigured"; + private static final String VOLUME_OPTION_AUTH_ALLOW = "auth.allow:"; private static final ProcessUtil processUtil = new ProcessUtil(); diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java index 76dc748e..ac77c76f 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java @@ -47,7 +47,7 @@ public class ValidationUtil { return isValid; } - public static boolean isValidIpQuad(String ipQuad) { + private static boolean isValidIpQuad(String ipQuad) { Pattern pattern = Pattern.compile("([01]?\\d\\d?|2[0-4]\\d|25[0-5])"); return pattern.matcher(ipQuad).matches(); } |