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/1404275b Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1404275b Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1404275b Branch: refs/heads/develop Commit: 1404275bdfbd85ef405c269f48fddc7db103fb6c Parents: 9480c7a 976cfaf Author: Matt Gilman <[email protected]> Authored: Wed Jun 10 12:28:42 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Wed Jun 10 12:28:42 2015 -0400 ---------------------------------------------------------------------- .../additionalDetails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
