mirror of https://github.com/apache/nifi.git
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
This commit is contained in:
commit
a43eecf1bd
|
@ -76,6 +76,9 @@
|
|||
<logger name="com.sun.jersey.spi.container.servlet.WebComponent" level="ERROR"/>
|
||||
<logger name="com.sun.jersey.spi.spring" level="ERROR"/>
|
||||
<logger name="org.springframework" level="ERROR"/>
|
||||
|
||||
<!-- Suppress non-error messages due to known warning about redundant path annotation (NIFI-574) -->
|
||||
<logger name="com.sun.jersey.spi.inject.Errors" level="ERROR"/>
|
||||
|
||||
<!--
|
||||
Logger for capturing user events. We do not want to propagate these
|
||||
|
|
|
@ -67,7 +67,6 @@ public class SystemDiagnosticsResource extends ApplicationResource {
|
|||
@GET
|
||||
@Consumes(MediaType.WILDCARD)
|
||||
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
|
||||
@Path("") // due to a bug in swagger
|
||||
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
|
||||
@ApiOperation(
|
||||
value = "Gets the diagnostics for the system NiFi is running on",
|
||||
|
|
Loading…
Reference in New Issue