Merge branch 'NIFI-427' 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/56c173fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/56c173fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/56c173fb Branch: refs/heads/develop Commit: 56c173fbd8df7ab6001a5e2f0480e78e00d73644 Parents: 35308ed 5c1afc0 Author: Mark Payne <[email protected]> Authored: Sat Jun 6 20:24:05 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Sat Jun 6 20:24:05 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/groups/ProcessGroup.java | 11 +++ .../nifi/groups/StandardProcessGroup.java | 88 ++++++++++++++------ 2 files changed, 75 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
