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

# Conflicts:
#
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.j
ava
This commit is contained in:
Kai Zimmermann
2016-03-04 12:11:35 +01:00
53 changed files with 1321 additions and 828 deletions

View File

@@ -25,7 +25,7 @@ public class SoftwareModuleAssigmentBuilder {
private final List<Long> ids;
public SoftwareModuleAssigmentBuilder() {
ids = new ArrayList<Long>();
ids = new ArrayList<>();
}
/**