Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-14714-blueprintv2 69b319aca -> de877aa7f (forced update)
Fix Merge issues for branch 'trunk' into branch-feature-AMBARI-14714 (mradhakrishnan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10a19e5c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10a19e5c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10a19e5c Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2 Commit: 10a19e5c1d414f8267758d324f180183ee6eaacb Parents: c23a33f Author: Madhuvanthi Radhakrishnan <mradhakrish...@hortonworks.com> Authored: Thu Dec 7 10:40:45 2017 -0800 Committer: Madhuvanthi Radhakrishnan <mradhakrish...@hortonworks.com> Committed: Thu Dec 7 11:02:59 2017 -0800 ---------------------------------------------------------------------- .../RootServiceComponentConfigurationResourceProvider.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/10a19e5c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java index 028cad3..5a6dff4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java @@ -85,6 +85,8 @@ public class RootServiceComponentConfigurationResourceProvider extends AbstractA @Inject private AmbariEventPublisher publisher; + + @Inject private RootServiceComponentConfigurationHandlerFactory rootServiceComponentConfigurationHandlerFactory;
