Merge branch 'nifi-270-release-setup' 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/ad1b768f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ad1b768f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ad1b768f Branch: refs/heads/develop Commit: ad1b768fc22633f52e1c8aba9f277ef39d6653fb Parents: 73384b2 c91d875 Author: joewitt <joew...@apache.org> Authored: Fri Jan 16 12:33:33 2015 -0500 Committer: joewitt <joew...@apache.org> Committed: Fri Jan 16 12:33:33 2015 -0500 ---------------------------------------------------------------------- maven-plugins/nar-maven-plugin/pom.xml | 206 ++++++++++++++++- maven-plugins/pom.xml | 346 ---------------------------- nifi/pom.xml | 114 +++------ 3 files changed, 233 insertions(+), 433 deletions(-) ----------------------------------------------------------------------