Merge branch 'nifi-1283' of https://github.com/jvwing/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b4bc105e Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b4bc105e Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b4bc105e Branch: refs/heads/NIFI-259 Commit: b4bc105ea955e7babd517f127f5f093144191211 Parents: 44ffddd c526656 Author: Mark Payne <[email protected]> Authored: Tue Jan 12 10:49:04 2016 -0500 Committer: Mark Payne <[email protected]> Committed: Tue Jan 12 10:49:04 2016 -0500 ---------------------------------------------------------------------- .../apache/nifi/controller/ControllerStatusReportingTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
