Merge remote-tracking branch 'eclipse/master' into cleanup-properties

# Conflicts: # hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.j ava
2016-03-04 12:11:35 +01:00
parent fbff46c7bd ba4e0fa79a
commit 25832e7e16
53 changed files with 1321 additions and 828 deletions
--- a/hawkbit-rest-resource/src/test/resources/log4j2.xml
+++ b/hawkbit-rest-resource/src/test/resources/log4j2.xml
@@ -17,7 +17,7 @@
        </Console>
    </Appenders>
    <Loggers>
-        <Logger name="org.eclipse.hawkbit.MockMvcResultPrinter" level="debug" />
+        <Logger name="org.eclipse.hawkbit.MockMvcResultPrinter" level="error" />

        <Root level="error">
            <AppenderRef ref="Console"/>