Merge branch 'master' into Rollout_migrate_table_to_grid

This commit is contained in:
asharani-murugesh
2016-02-22 15:50:18 +01:00
3 changed files with 11 additions and 6 deletions

5
.gitignore vendored
View File

@@ -16,6 +16,11 @@
*.jar
*.war
######################
# Sonar
######################
.sonar_lock
# Eclipse IDE
*.pydevproject

View File

@@ -15,8 +15,8 @@ hawkbit.server.controller.security.authentication.gatewaytoken.enabled=false
spring.profiles.active=amqp
vaadin.servlet.params.productionMode=false
vaadin.static.servlet.params.productionMode=false
vaadin.servlet.productionMode=false
vaadin.static.servlet.productionMode=false
## Configuration for RabbitMQ integration
hawkbit.server.amqp.username=guest

View File

@@ -29,10 +29,10 @@ flyway.initOnMigrate=true
flyway.sqlMigrationSuffix=${spring.jpa.database}.sql
# Vaadin Servlet
vaadin.static.servlet.params.resourceCacheTime=${spring.resources.cache-period}
vaadin.static.servlet.params.productionMode=true
vaadin.servlet.params.productionMode=true
vaadin.servlet.params.resourceCacheTime=${spring.resources.cache-period}
vaadin.static.servlet.resourceCacheTime=${spring.resources.cache-period}
vaadin.static.servlet.productionMode=true
vaadin.servlet.productionMode=true
vaadin.servlet.resourceCacheTime=${spring.resources.cache-period}
vaadin.servlet.urlMapping=/UI/*
vaadin.servlet.params.heartbeatInterval=60
vaadin.servlet.params.closeIdleSessions=false