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/e456ea37 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e456ea37 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e456ea37 Branch: refs/heads/NIFI-271 Commit: e456ea37f4232e9072631af986f54336904318bd Parents: d769b50 39735c3 Author: Matt Gilman <[email protected]> Authored: Wed Apr 8 11:28:44 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Wed Apr 8 11:28:44 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/remote/client/socket/SocketClient.java | 8 +++++++- .../nifi/controller/scheduling/StandardProcessScheduler.java | 4 ++-- .../java/org/apache/nifi/processor/SimpleProcessLogger.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
