diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-07-15 12:15:07 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-07-15 12:15:07 +0530 |
| commit | eb56b6349e9e469d27dcc30ea342ca947a1484c7 (patch) | |
| tree | c1765ca1e4e2d25dab52bea07f78dac522a89705 /src | |
| parent | 2ebf82b35cc020104efb5bae5f01ead365c0e85b (diff) | |
| parent | 83c6b44dbe38c5a6f3a619746cbe86f92cacf5dc (diff) | |
Merge branch 'import-keys'
Diffstat (limited to 'src')
| -rw-r--r-- | src/com.gluster.storage.management.gui/icons/tango/32x32/export-keys.png | bin | 1194 -> 0 bytes | |||
| -rw-r--r-- | src/com.gluster.storage.management.gui/icons/tango/32x32/import-keys.png | bin | 1998 -> 0 bytes | |||
| -rw-r--r-- | src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java | 9 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/export-keys.png b/src/com.gluster.storage.management.gui/icons/tango/32x32/export-keys.png Binary files differdeleted file mode 100644 index 16d47578..00000000 --- a/src/com.gluster.storage.management.gui/icons/tango/32x32/export-keys.png +++ /dev/null diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/import-keys.png b/src/com.gluster.storage.management.gui/icons/tango/32x32/import-keys.png Binary files differdeleted file mode 100644 index d7f0d0c3..00000000 --- a/src/com.gluster.storage.management.gui/icons/tango/32x32/import-keys.png +++ /dev/null diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java index 169d41b0..a589c2a2 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java @@ -86,13 +86,4 @@ public class KeysResource extends AbstractResource { return zipFile; } - - - - - public static void main(String[] args) { - KeysResource key = new KeysResource(); - // key.exportSshkeys(); - System.out.println(System.getProperty("java.io.tmpdir")); - } } |
