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/4b852ebc Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4b852ebc Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4b852ebc Branch: refs/heads/NIFI-250 Commit: 4b852ebc651e2af7e9ba8b72494b661a86400993 Parents: d145e20 a738be8 Author: Matt Gilman <[email protected]> Authored: Tue Feb 3 09:51:59 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Tue Feb 3 09:51:59 2015 -0500 ---------------------------------------------------------------------- README.md | 14 ++++++++++++++ nifi-nar-maven-plugin/README.md | 14 ++++++++++++++ nifi-nar-maven-plugin/pom.xml | 8 ++++---- nifi-site/README.md | 14 ++++++++++++++ nifi/README.md | 14 ++++++++++++++ nifi/nifi-assembly/pom.xml | 1 + nifi/pom.xml | 21 +++++++++------------ 7 files changed, 70 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
