lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
2,112 Commits 1 Branch 0 Tags
bcdfed8511e7cb367d9f44da83a9072be79dab2f
Commit Graph

2112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SirWayne
57c722ea11 Remove the controller properties for polling time and overdue time and 
use the new tenant configuration management, which handle the tenant
specific polling time.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-14 15:13:51 +01:00
SirWayne
0b813a0cc8 Create rabbitTemplate bean with jackson message converter 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-14 14:30:14 +01:00
Kai Zimmermann
4f06b60880 Merge pull request #85 from bsinno/Stabilise_tests 
Should help with selenium test on hawkBit based UIs. Thx.
 2016-03-14 12:57:45 +01:00
Kai Zimmermann
ca9d42d711 Merge pull request #71 from bsinno/Rollout_migrate_table_to_grid_final 
Thx for the contribution.
Note: @asharani-murugesh is part of @michahirsch and my organisation.
 2016-03-14 10:03:37 +01:00
Kai Zimmermann
807aaf629c Merge remote-tracking branch 'eclipse/master' into feature_MECS-86_tenant_specific_polling_configuration 
# Conflicts:
#
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/Tena
ntConfigurationDashboardView.java
 2016-03-14 09:51:00 +01:00
Kai Zimmermann
a127c30070 Removed unnecessary colon 2016-03-14 07:24:43 +01:00
Kai Zimmermann
81d5c91197 Merge remote-tracking branch 'eclipse/master' into Rollout_migrate_table_to_grid_final 2016-03-14 07:23:30 +01:00
Kai Zimmermann
6f9d6f7860 Merge pull request #84 from bsinno/doc-links-configurable 
Migrated hardcoded doc links to configurable setup.
 2016-03-12 20:33:24 +01:00
Kai Zimmermann
3f763e7db4 Migrated hardcoded doc links to configurable setup. 2016-03-12 19:08:12 +01:00
Kai Zimmermann
9f7ed2dbdb Merge pull request #83 from bsinno/demo-login-opzional 
Made demo login field optional.
 2016-03-11 19:59:33 +01:00
Kai Zimmermann
b5a826eb13 Made demo login field optional. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-11 19:30:07 +01:00
Jonathan Philip Knoblauch
c91bb15ccb Refactoring after review. 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-11 16:39:54 +01:00
asharani-murugesh
e525da0375 Merge branch 'master' into Stabilise_tests 2016-03-11 15:59:10 +01:00
Jonathan Philip Knoblauch
6cc64639bd Fix for sonar issue: Methods should not have too many lines 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-11 11:19:43 +01:00
Kai Zimmermann
4b5795d18b Merge pull request #81 from bsinno/stabilize-rollout-tests 
Stabilize rollout tests
 2016-03-11 10:42:58 +01:00
Kai Zimmermann
65fa9a8c48 Merge pull request #80 from bsinno/Clean_Code 
👍  Thx dennis
 2016-03-11 10:23:10 +01:00
SirWayne
6659e9e9ee Set the event strategy transient 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-11 09:45:12 +01:00
Kai Zimmermann
50eb1a4978 Merge pull request #79 from bsinno/optimize_simulator_throughput 
Optimize simulator throughput
 2016-03-11 09:44:55 +01:00
Kai Zimmermann
3da4e73ede Raised timeout for the async test. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-11 09:37:49 +01:00
Kai Zimmermann
de78077920 Added check for rollout repo content after test. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-11 09:27:48 +01:00
Michael Hirsch
6ac4cac60f Merge pull request #78 from bsinno/fixed-wrong-filter-param 
is ok merging.
 2016-03-10 14:37:21 +01:00
Kai Zimmermann
44ce503a28 Introduced direct return of default 2016-03-10 14:10:15 +01:00
SirWayne
b07fbd4b1c Merge branch 'feature_MECS-86_tenant_specific_polling_configuration' of https://github.com/bsinno/hawkbit.git into feature_MECS-86_tenant_specific_polling_configuration 2016-03-10 10:27:48 +01:00
SirWayne
e47d540eb5 Fix event listening for duration field 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-10 10:27:31 +01:00
Kai Zimmermann
462419b2f9 Fixed broken sorting for sm type and ds type 2016-03-09 19:53:19 +01:00
Kai Zimmermann
6379e93c5e Fixed max assignments filter on sw module type 2016-03-09 19:34:28 +01:00
Kai Zimmermann
a8a45a12c6 Merge pull request #76 from bsinno/master 
I messed this up a bit as I used our Bosch master for the pullrequest, but I think things should be ok.
 2016-03-09 19:07:32 +01:00
Kai Zimmermann
42b37c9c06 Merge pull request #74 from bsinno/Sonar_remove_unused_method_parameters 
Looks good, thx for the contribution
 2016-03-09 18:59:07 +01:00
SirWayne
89431feb8e Remove @Component from properties which is loaded by the autoconfig 
module, because then will be 2 beans created

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-09 16:26:33 +01:00
SirWayne
a4cc3df092 Fix test properties 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-09 15:36:59 +01:00
SirWayne
ed97031faf Merge branch 'master' into 
feature_MECS-86_tenant_specific_polling_configuration

Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentficationTest.java
	hawkbit-repository/src/test/resources/application-test.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-09 13:29:40 +01:00
SirWayne
0824499322 Merge branch 'feature_MECS-86_tenant_specific_polling_configuration' of https://github.com/bsinno/hawkbit.git into feature_MECS-86_tenant_specific_polling_configuration 2016-03-09 11:13:09 +01:00
Jonathan Philip Knoblauch
65d3b5a6b8 Added license header and fixed sonar issue: Fields and methods should not have conflicting names 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-09 10:54:05 +01:00
asharani-murugesh
e073800703 Fixed compilation issue 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-09 09:43:52 +01:00
asharani-murugesh
efc277cc7a Merge branch 'master' into Rollout_migrate_table_to_grid_final 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-09 09:34:41 +01:00
Michael Hirsch
75bf917e62 Merge branch 'master' of https://github.com/bsinno/hawkbit.git 2016-03-08 19:30:26 +01:00
Kai Zimmermann
bc7c7ec87d Merge pull request #77 from bsinno/fix_mgmt_client_startup 
fix mgmt client startup with xml problem and not unique bean exception
 2016-03-08 18:06:54 +01:00
Michael Hirsch
dd7f7d2a9d fix mgmt client startup with xml problem and not unique bean exception 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-08 17:39:24 +01:00
asharani-murugesh
3f8ffbe739 Merge branch 'master' into Rollout_migrate_table_to_grid_final 2016-03-08 14:29:02 +01:00
Kai Zimmermann
692a7fbdca Upgraded identified libs for 0.2 2016-03-08 13:41:18 +01:00
Kai Zimmermann
7260de9350 Merge pull request #75 from bsinno/BASEAMQP_SERVICE_TEST 
Looks good, more tests are always welcome 😄
 2016-03-08 13:30:07 +01:00
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