Merge branch 'develop' into NIFI-182
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4146a23c Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4146a23c Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4146a23c Branch: refs/heads/develop Commit: 4146a23cee7fb5d35318a96b1d8cc30a43e8a921 Parents: 3d0766b 732cb70 Author: Matt Gilman <[email protected]> Authored: Fri Dec 19 07:50:05 2014 -0500 Committer: Matt Gilman <[email protected]> Committed: Fri Dec 19 07:50:05 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 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4146a23c/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml ----------------------------------------------------------------------
