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/35308edf Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/35308edf Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/35308edf Branch: refs/heads/develop Commit: 35308edf4ef9a996af3c3b502353cdcddc3679b4 Parents: ffc5cdb c9ddf21 Author: Mark Payne <marka...@hotmail.com> Authored: Sat Jun 6 20:22:48 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Sat Jun 6 20:22:48 2015 -0400 ---------------------------------------------------------------------- .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
