Merge branch 'develop' of http://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/548f6d08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/548f6d08 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/548f6d08 Branch: refs/heads/develop Commit: 548f6d08352291c0e553a8d081732b16405609c2 Parents: a5d6f88 2d0bb1c Author: Mark Payne <marka...@hotmail.com> Authored: Fri Jun 19 13:08:49 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Fri Jun 19 13:08:49 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java | 5 +++++ 1 file changed, 5 insertions(+) ----------------------------------------------------------------------
