SLIDER-151 java 6 compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a3420660 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a3420660 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a3420660 Branch: refs/heads/develop Commit: a3420660e03b30174182bef02df4ff43f850e9b3 Parents: 7d52f8a Author: Steve Loughran <[email protected]> Authored: Fri Aug 22 10:41:59 2014 +0100 Committer: Steve Loughran <[email protected]> Committed: Tue Dec 16 20:25:39 2014 +0000 ---------------------------------------------------------------------- .../web/rest/management/resources/AggregateConfResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a3420660/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/resources/AggregateConfResource.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/resources/AggregateConfResource.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/resources/AggregateConfResource.java index dc26699..75d417b 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/resources/AggregateConfResource.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/resources/AggregateConfResource.java @@ -63,7 +63,7 @@ public class AggregateConfResource { } private void initConfMap() { - confMap = new HashMap<>(); + confMap = new HashMap<String, ConfTreeResource>(); confMap.put("internal", internal); confMap.put("resources", resources); confMap.put("appConf", appConf);
