Kai Zimmermann 7f68aedd78 Merge branch 'master' into feature_boot_13_sec_41 ...

Conflicts:
	hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/FreePortFileWriter.java
	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/FreePortFileWriter.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>

2016-08-19 08:35:58 +02:00

..

java/org/eclipse/hawkbit/ddi/rest/resource

Merge branch 'master' into feature_boot_13_sec_41

2016-08-19 08:35:58 +02:00

resources

Started migration for Boot 1.3 and Security 4.1

2016-07-07 12:39:40 +02:00