Kai Zimmermann 25832e7e16 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

..

application-test.properties

Completed migration to ConfigurationProperties annotation. Added boot metadata generation to build.

2016-02-25 17:59:46 +01:00

log4j2.xml

Fixed ordering problem.

2016-03-03 17:46:14 +01:00