Clone
Guillaume Nodet <gnodet@gmail.com>
committed
on 12 Oct 18
Prepare org.apache.camel.management for extraction
# Conflicts:
# camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.… Show more
Prepare org.apache.camel.management for extraction

# Conflicts:

#       camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java

#       camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java

#       camel-core/src/main/java/org/apache/camel/impl/DefaultManagementStrategy.java

#       camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java

#       camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java

#       camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java

#       camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentParallelTest.java

#       camel-core/src/test/java/org/apache/camel/management/ManagedNamePatternIncludeHostNameTest.java

#       components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java

Show less

master + 9 more