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/a43eecf1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a43eecf1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a43eecf1 Branch: refs/heads/master Commit: a43eecf1bde9b7ab30fbfdcdf5bd1d04fa2f0985 Parents: 34c81e1 b6b8c95 Author: joewitt <[email protected]> Authored: Sat May 2 16:43:44 2015 -0400 Committer: joewitt <[email protected]> Committed: Sat May 2 16:43:44 2015 -0400 ---------------------------------------------------------------------- .../nifi-resources/src/main/resources/conf/logback.xml | 3 +++ .../java/org/apache/nifi/web/api/SystemDiagnosticsResource.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
