SirWayne ed97031faf Merge branch 'master' into ...

feature_MECS-86_tenant_specific_polling_configuration

Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentficationTest.java
	hawkbit-repository/src/test/resources/application-test.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

2016-03-09 13:29:40 +01:00

..

src

Merge branch 'master' into

2016-03-09 13:29:40 +01:00

.gitignore

Remove swagger and minor feature extensions and bug fixes

2016-01-21 13:42:38 +01:00

pom.xml

Remove broken css compressor

2016-03-04 21:38:57 +01:00