Marcel Mager (INST-IOT/ESB)
3b47d43dec
Merge branch 'master' into feature_target_filtering_supports_overdue
Conflicts:
hawkbit-repository\hawkbit-repository-jpa\src\main\java\org\eclipse\hawkbit\repository\jpa\JpaDeploymentManagement.java
hawkbit-repository\hawkbit-repository-jpa\src\main\java\org\eclipse\hawkbit\repository\jpa\JpaTargetManagement.java
hawkbit-ui\src\main\java\org\eclipse\hawkbit\ui\management\targettable\TargetBeanQuery.java
hawkbit-ui\src\main\java\org\eclipse\hawkbit\ui\management\targettable\TargetTable.java
Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>