From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 15 Jan 2014 05:08:51 +0000 (+0000)
Subject: Merge "Add shutdown hook."
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~92
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=58fa0dd65634800eccaa1bbe85769835a0e6e071

Merge "Add shutdown hook."
---

58fa0dd65634800eccaa1bbe85769835a0e6e071
diff --cc opendaylight/config/pom.xml
index 1a29046e2d,ca576824fa..acd4916a4b
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@@ -41,8 -41,9 +41,10 @@@
          <module>netty-timer-config</module>
          <module>config-persister-directory-adapter</module>
          <module>config-persister-directory-xml-adapter</module>
 +        <module>config-persister-directory-autodetect-adapter</module>
          <module>yang-test-plugin</module>
+         <module>shutdown-api</module>
+         <module>shutdown-impl</module>
      </modules>
  
      <profiles>
diff --cc opendaylight/distribution/opendaylight/pom.xml
index 9f3862f2ad,7a4bc4a031..5acdec834d
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@@ -262,12 -263,18 +262,23 @@@
            <artifactId>config-persister-directory-xml-adapter</artifactId>
            <version>${config.version}</version>
          </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>config-persister-directory-autodetect-adapter</artifactId>
 +          <version>${config.version}</version>
 +        </dependency>
  
+         <dependency>
+           <groupId>org.opendaylight.controller</groupId>
+           <artifactId>shutdown-api</artifactId>
+           <version>${config.version}</version>
+         </dependency>
+         <dependency>
+           <groupId>org.opendaylight.controller</groupId>
+           <artifactId>shutdown-impl</artifactId>
+           <version>${config.version}</version>
+         </dependency>
+ 
         <!-- Netconf -->
          <dependency>
            <groupId>org.opendaylight.controller</groupId>