Merging feature/SLIDER-181_Storm_Package to develop (jdk6 change)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/599e9721 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/599e9721 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/599e9721 Branch: refs/heads/feature/SLIDER-151_REST_API Commit: 599e9721e161feed526a9fe712791af10ce5ca03 Parents: 47822df Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Thu Aug 14 18:07:20 2014 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Thu Aug 14 18:07:20 2014 -0700 ---------------------------------------------------------------------- .../org/apache/slider/providers/agent/AgentProviderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/599e9721/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index 8ce1f18..91bc0a6 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -1180,7 +1180,7 @@ public class AgentProviderService extends AbstractProviderService implements hostLevelParams.put(CONTAINER_ID, containerId); cmd.setHostLevelParams(hostLevelParams); - Map<String, String> roleParams = new TreeMap<>(); + Map<String, String> roleParams = new TreeMap<String, String>(); cmd.setRoleParams(roleParams); cmd.getRoleParams().put("auto_restart", Boolean.toString(isMarkedAutoRestart));
