You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2016/02/16 18:40:53 UTC
[03/11] brooklyn-server git commit: SshMachineLocation: fix compile
warnings
SshMachineLocation: fix compile warnings
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a799cf86
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a799cf86
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a799cf86
Branch: refs/heads/master
Commit: a799cf86dc6c61af281fb843f763abe4e6ced059
Parents: 46bf6b5
Author: Aled Sage <al...@gmail.com>
Authored: Mon Feb 15 11:33:39 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Feb 15 11:33:39 2016 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/location/ssh/SshMachineLocation.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a799cf86/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
index 2ff9491..50349e6 100644
--- a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
@@ -179,12 +179,14 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat
public static final ConfigKey<Boolean> DETECT_MACHINE_DETAILS = ConfigKeys.newBooleanConfigKey("detectMachineDetails",
"Attempt to detect machine details automatically. Works with SSH-accessible Linux instances.", true);
+ @SuppressWarnings("serial")
public static final ConfigKey<Iterable<String>> PRIVATE_ADDRESSES = ConfigKeys.newConfigKey(
new TypeToken<Iterable<String>>() {},
"privateAddresses",
"Private addresses of this machine, e.g. those within the private network",
null);
+ @SuppressWarnings("serial")
public static final ConfigKey<Map<Integer, String>> TCP_PORT_MAPPINGS = ConfigKeys.newConfigKey(
new TypeToken<Map<Integer, String>>() {},
"tcpPortMappings",
@@ -248,7 +250,7 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat
* i.e. they can be specified per command on the tool
*/
// TODO: Fully specify.
- public static final Set<ConfigKey<?>> REUSABLE_SSH_PROPS = ImmutableSet.of(
+ public static final Set<ConfigKey<?>> REUSABLE_SSH_PROPS = ImmutableSet.<ConfigKey<?>>of(
STDOUT, STDERR, SCRIPT_DIR, CLOSE_CONNECTION,
SshTool.PROP_SCRIPT_HEADER, SshTool.PROP_PERMISSIONS, SshTool.PROP_LAST_MODIFICATION_DATE,
SshTool.PROP_LAST_ACCESS_DATE, SshTool.PROP_OWNER_UID, SshTool.PROP_SSH_RETRY_DELAY);