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/3a0cb2d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3a0cb2d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3a0cb2d6 Branch: refs/heads/NIFI-250 Commit: 3a0cb2d63404210da1b4b6827bec84f87166f60b Parents: 4e85e34 629ec37 Author: Matt Gilman <[email protected]> Authored: Wed Feb 4 09:35:29 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Wed Feb 4 09:35:29 2015 -0500 ---------------------------------------------------------------------- .../src/main/java/MyProcessor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
