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/cb63c666 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cb63c666 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cb63c666 Branch: refs/heads/nifi-27 Commit: cb63c66602a398b0c14cc78732db5ca63e36a94c Parents: 567dfc7 0125f3d Author: Mark Payne <marka...@hotmail.com> Authored: Tue Dec 9 11:20:13 2014 -0500 Committer: Mark Payne <marka...@hotmail.com> Committed: Tue Dec 9 11:20:13 2014 -0500 ---------------------------------------------------------------------- nar-bundles/framework-bundle/framework/site-to-site/pom.xml | 4 ++++ nar-bundles/framework-bundle/pom.xml | 5 +++++ 2 files changed, 9 insertions(+) ----------------------------------------------------------------------
