Repository: nifi
Updated Branches:
  refs/heads/NIFI-259 e943c41a4 -> ae6f61536


NIFI-259:
- Fixing contrib check issues.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/65dfcd06
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/65dfcd06
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/65dfcd06

Branch: refs/heads/NIFI-259
Commit: 65dfcd06a329a6ae6f22f6f80ccf4f5a519eeade
Parents: e943c41
Author: Matt Gilman <[email protected]>
Authored: Thu Jan 14 11:16:35 2016 -0500
Committer: Matt Gilman <[email protected]>
Committed: Thu Jan 14 11:16:35 2016 -0500

----------------------------------------------------------------------
 .../org/apache/nifi/cluster/manager/impl/WebClusterManager.java   | 3 ++-
 .../main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java  | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/65dfcd06/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
index db98e7d..a0823d6 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
@@ -2557,7 +2557,8 @@ public class WebClusterManager implements 
HttpClusterManager, ProtocolHandler, C
                 || isProcessGroupEndpoint(uri, method)
                 || isTemplateEndpoint(uri, method) || 
isFlowSnippetEndpoint(uri, method)
                 || isProvenanceQueryEndpoint(uri, method) || 
isProvenanceEventEndpoint(uri, method)
-                || isControllerServicesEndpoint(uri, method) || 
isControllerServiceEndpoint(uri, method) || 
isControllerServiceReferenceEndpoint(uri, method) || 
isControllerServiceStateEndpoint(uri, method)
+                || isControllerServicesEndpoint(uri, method) || 
isControllerServiceEndpoint(uri, method)
+                || isControllerServiceReferenceEndpoint(uri, method) || 
isControllerServiceStateEndpoint(uri, method)
                 || isReportingTasksEndpoint(uri, method) || 
isReportingTaskEndpoint(uri, method) || isReportingTaskStateEndpoint(uri, 
method)
                 || isDropRequestEndpoint(uri, method);
     }

http://git-wip-us.apache.org/repos/asf/nifi/blob/65dfcd06/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index 4f6f58a..1ba359e 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -18,7 +18,6 @@ package org.apache.nifi.web;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.lf5.util.Resource;
 import org.apache.nifi.action.Action;
 import org.apache.nifi.action.Component;
 import org.apache.nifi.action.FlowChangeAction;

Reply via email to