SirWayne 9c7f48ded5 Merge branch 'master' into feature_rollouts_credentials ...

Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ArtifactManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ReportManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SoftwareManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TagManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantStatsManagement.java


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

2016-06-06 10:35:02 +02:00

..

src

Merge branch 'master' into feature_rollouts_credentials

2016-06-06 10:35:02 +02:00

pom.xml

Split into separate maven modules.

2016-05-25 17:43:57 +02:00