You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/04/23 20:02:36 UTC
[1/2] incubator-nifi git commit: Increase inactive rather than active
counter where port is not running.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 503c773f4 -> 61b1d128e
Increase inactive rather than active counter where port is not running.
Signed-off-by: Matt Gilman <ma...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2393a6fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2393a6fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2393a6fc
Branch: refs/heads/develop
Commit: 2393a6fc53b4f815569a2fe70eff53b21aea3e48
Parents: ff831dc
Author: Mark Latimer <ma...@gmail.com>
Authored: Wed Apr 22 13:48:11 2015 +0100
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Apr 23 14:00:23 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2393a6fc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
index 2402b73..bf216c3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
@@ -1143,7 +1143,7 @@ public final class DtoFactory {
if (port.isRunning()) {
activeRemoteOutputPortCount++;
} else {
- activeRemoteOutputPortCount++;
+ inactiveRemoteOutputPortCount++;
}
}
}
[2/2] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by mc...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/61b1d128
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/61b1d128
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/61b1d128
Branch: refs/heads/develop
Commit: 61b1d128e13ac3cea311f5d6c4e9f02bddec884a
Parents: 2393a6f 503c773
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Apr 23 14:01:58 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Apr 23 14:01:58 2015 -0400
----------------------------------------------------------------------
.../distributed/cache/server/TestServerAndClient.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------