Merge remote-tracking branch 'origin/master' into

fix_Consitent_table_muliselect

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-06-10 10:53:50 +02:00
108 changed files with 2770 additions and 3036 deletions

View File

@@ -452,7 +452,7 @@ menu.title = Software Provisioning
#Rollout management
prompt.number.of.groups = Number of groups
prompt.tigger.thresold = Trigger threshold
prompt.tigger.threshold = Trigger threshold
prompt.error.threshold = Error threshold
prompt.distribution.set = Distribution set
caption.configure.rollout = Configure rollout