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/7f9dff52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/7f9dff52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/7f9dff52 Branch: refs/heads/develop Commit: 7f9dff52b067022366f194015a274e5af532ec47 Parents: 1367b39 6fa5968 Author: Aldrin Piri <[email protected]> Authored: Wed Apr 22 17:12:23 2015 -0400 Committer: Aldrin Piri <[email protected]> Committed: Wed Apr 22 17:12:23 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/web/util/SnippetUtils.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
