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/cf3dbef2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cf3dbef2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cf3dbef2 Branch: refs/heads/master Commit: cf3dbef2a8917191464708060d49449cb2e23160 Parents: c90bb8a 3472bf3 Author: Matt Gilman <[email protected]> Authored: Tue May 5 23:04:18 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue May 5 23:04:18 2015 -0400 ---------------------------------------------------------------------- nifi-nar-maven-plugin/pom.xml | 2 +- nifi-parent/pom.xml | 32 +++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
