lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
3,321 Commits 1 Branch 0 Tags
4e59c6c8cc9d14cf6242524ef1d5f67d64dd52c7
Commit Graph

3321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Zimmermann
b1894e1d1d Removed libraries out of test that where already covered by compile and provided 2016-03-08 12:41:15 +01:00
SirWayne
6c74c1186d Create unit test for the json amqp message conversion 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-08 12:23:31 +01:00
asharani-murugesh
21fb44ff05 Merge branch 'master' into Stabilise_tests 2016-03-08 11:51:41 +01:00
Kai Zimmermann
e8473928c9 Merge pull request #61 from bsinno/Sonar_issue_Fields_and_methods_have_conflicting_names 
👍 looks good, thx
 2016-03-08 08:42:43 +01:00
Jonathan Philip Knoblauch
b54f203fad Refactored the createAndStartRolloutInAsync test 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-07 17:54:26 +01:00
asharani-murugesh
7fda3b9da8 Added missing header 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 16:24:13 +01:00
asharani-murugesh
fd9ff8fdc5 Resolved merge conflicts 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 16:01:29 +01:00
asharani-murugesh
ebcc50965d Addressed review comments 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 15:57:01 +01:00
asharani-murugesh
9da59288e8 Refactored customerfilterUIIT 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 15:24:06 +01:00
Jonathan Philip Knoblauch
8f35b75857 Removed unused target parameter in method forceQuitAction and change assertEquals to assertThat 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-07 14:44:34 +01:00
asharani-murugesh
6c091a498a Addressed review comments 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 14:15:43 +01:00
Kai Zimmermann
f730c9cee4 Merge pull request #73 from bsinno/Clean_Code 
👍 looks good, thx @SirWayne
 2016-03-07 13:56:57 +01:00
SirWayne
43d01da309 Fix typo after pull request review 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-07 13:35:26 +01:00
Jonathan Philip Knoblauch
cf48ef215a Changed names for editRollout boolean and discardRolllout Button 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-07 13:14:40 +01:00
SirWayne
f4791743ce Add test case description 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-07 12:18:18 +01:00
Kai Zimmermann
670ba27ec2 Merge pull request #72 from bsinno/master 
👍 ok
 2016-03-07 10:51:09 +01:00
asharani-murugesh
51ba6b518e Added javadoc 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 10:44:22 +01:00
Jonathan Philip Knoblauch
7fec5c8407 Changed name saveDistributionButton to saveDistributionBtn and discardDistributionButton to discardDistributionBtn for consistency 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-07 10:07:06 +01:00
SirWayne
52be35c7ff Rename deadletter queue and exchange 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-07 10:02:00 +01:00
asharani-murugesh
578bd66b28 merged master 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-06 09:26:53 +01:00
Kai Zimmermann
f2fe6270f1 Merge pull request #70 from bsinno/amqp_sender_uses_wrong_method_to_send_to_exchange 
looks good
 2016-03-05 18:13:04 +01:00
Michael Hirsch
da9124cecd use correct method to send the message to rabbitMQ, exchange was not 
used from parameter

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-05 17:43:39 +01:00
Kai Zimmermann
6cfde5f32c Merge pull request #69 from bsinno/remove_component_annotation_from_amqp_properties 
👍 merged
 2016-03-05 14:47:06 +01:00
Michael Hirsch
ff156234fa Annotation component must be removed because bean will otherwise 
registered twice because of EnableAutoConfiguration in the
AmqpConfiguration

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-05 14:11:37 +01:00
Kai Zimmermann
867de9a1e2 Merge pull request #68 from bsinno/update_vaadin_bom_7.6.3 
Looks good
 2016-03-05 11:51:18 +01:00
Michael Hirsch
fb9454d840 update vaadin-bom to 7.6.3 version because 7.5 version is not working 
with updated vaadin 7.6 in hawkbit

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-05 11:21:25 +01:00
Michael Hirsch
d8d8b9d54a Merge pull request #67 from bsinno/remove-broken-css-compress 
👍 ok merging...
 2016-03-04 22:05:42 +01:00
Kai Zimmermann
54b29ea446 Remove broken css compressor 2016-03-04 21:38:57 +01:00
Kai Zimmermann
11d36e4677 Merge pull request #65 from bsinno/upgrade_vaadin_version_to_7.6.3 
👍 merged
 2016-03-04 21:06:46 +01:00
Michael Hirsch
0202bbba50 Merge pull request #50 from bsinno/harmonize-test-documentation 
merging
 2016-03-04 18:35:40 +01:00
Kai Zimmermann
dcea53f4c8 Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-04 18:14:26 +01:00
Michael Hirsch
c02c630218 Merge pull request #54 from bsinno/cleanup-properties 
ok merging.. 👍
 2016-03-04 18:12:01 +01:00
asharani-murugesh
48906bdea8 removed the comment 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-04 15:46:45 +01:00
asharani-murugesh
a9eaacb8b9 Added documenatation 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-04 14:24:03 +01:00
asharani-murugesh
3854061d4f Sonar issues fixed 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-04 14:17:43 +01:00
Nonnenmacher Fabian (INST-ICM/BSV-AS)
9646e1eabc Fixed review findings 2016-03-04 12:34:39 +01:00
Kai Zimmermann
a227ede0e0 Completed merge 2016-03-04 12:21:38 +01:00
Kai Zimmermann
25832e7e16 Merge remote-tracking branch 'eclipse/master' into cleanup-properties 
# Conflicts:
#
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.j
ava
 2016-03-04 12:11:35 +01:00
asharani-murugesh
7fe6804045 Upgrade vaadin to version 7.6.3 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-04 10:05:41 +01:00
Michael Hirsch
ba4e0fa79a Merge pull request #64 from bsinno/mgmtapi-shows-wrong-status-content 
👍 ok merging
 2016-03-04 09:23:46 +01:00
asharani-murugesh
ab2a7b8f8d Merge branch 'master' into Rollout_migrate_table_to_grid 2016-03-04 09:13:18 +01:00
Kai Zimmermann
0fc63a452f Switched to REPORTEDAT to be more consitend with other fields. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-04 08:59:17 +01:00
Kai Zimmermann
3b74db0cac Sleep raised to 10ms as stem.currentMillis is not updated every 
millisecond.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-04 08:40:47 +01:00
Kai Zimmermann
f17f58f78a Fixed typo. 2016-03-03 21:24:39 +01:00
Kai Zimmermann
71653470dc Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-03 20:59:15 +01:00
Kai Zimmermann
8c5945badd Fixed sort order in UI 2016-03-03 20:53:54 +01:00
Kai Zimmermann
794db18673 Added comments and changed default sorting for actions. 2016-03-03 20:46:50 +01:00
Kai Zimmermann
e7173aa846 Cleanup messed up actionstatus sorting. We used sort param but had 
hardcoded sorting in the reposirory. I added also reportAt based
sorting.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-03 18:54:50 +01:00
Kai Zimmermann
19fe7e5a46 Fixed ordering problem. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-03 17:46:14 +01:00
Kai Zimmermann
3e158deb6b Fixed typo. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-03 17:09:09 +01:00