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/ea17562d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ea17562d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ea17562d Branch: refs/heads/develop Commit: ea17562dd328d5f38e11ca8ff4eb81a617fb8e6e Parents: cbb1746 732cb70 Author: Mark Payne <marka...@hotmail.com> Authored: Fri Dec 19 10:03:28 2014 -0500 Committer: Mark Payne <marka...@hotmail.com> Committed: Fri Dec 19 10:03:28 2014 -0500 ---------------------------------------------------------------------- nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml | 2 +- .../nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp | 2 +- nar-bundles/pom.xml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
