]> source.dussan.org Git - sonarqube.git/commitdiff
Automatic merge from branch-6.2
authorssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
Thu, 1 Dec 2016 11:36:30 +0000 (12:36 +0100)
committerssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
Thu, 1 Dec 2016 11:36:30 +0000 (12:36 +0100)
* origin/branch-6.2:
  SONAR-8335 rename LogDomain#ES_CLIENT to LogDomain#ES
  SONAR-8335 add IT on dynamic log level change
  SONAR-8335 make changing root level change level of all loggers
  SONAR-8335 add missing coverage on jmx log property
  SONAR-8335 drop dead code ServerLogging#getCurrentLogFile
  SONAR-8335 move RootLoggerConfig out of LogbackHelper
  SONAR-8335 move LogBackHelper to subpackage logging

1  2 
server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java

index a31db40f3ee9fb10dba2e086a351158166025fc4,65f5a0826db16f0e9a5e73c9d76860198300ce2a..25c7fa6fe557e938d51cf25ac777ee7235b7e49c
@@@ -105,10 -105,10 +105,10 @@@ public class ComputeEngineContainerImpl
      );
      assertThat(picoContainer.getParent().getParent().getParent().getComponentAdapters()).hasSize(
        COMPONENTS_IN_LEVEL_1_AT_CONSTRUCTION
-         + 26 // level 1
+         + 27 // level 1
          + 47 // content of DaoModule
          + 2 // content of EsSearchModule
 -        + 62 // content of CorePropertyDefinitions
 +        + 63 // content of CorePropertyDefinitions
          + 1 // content of CePropertyDefinitions
      );
      assertThat(picoContainer.getParent().getParent().getParent().getParent()).isNull();