Sync changes: Merge branch 'master' into api_refactoring

Conflicts:
	plugins/network-elements/dns-notifier/pom.xml

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2013-01-08 20:33:08 -08:00
commit 077f47193d
No known key found for this signature in database
GPG Key ID: 484248210EE3D884
2 changed files with 1 additions and 3 deletions

View File

@ -27,7 +27,6 @@
</parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-hypervisor-simulator</artifactId>
<version>4.1.0-SNAPSHOT</version>
<name>Apache CloudStack Plugin - Hypervisor Simulator</name>
<description>Simulator Hypervisor for Cloudstack</description>
<build>
@ -42,4 +41,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
</project>

View File

@ -27,7 +27,6 @@
</parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-example-dns-notifier</artifactId>
<version>4.1.0-SNAPSHOT</version>
<name>Apache CloudStack Plugin - Dns Notifier Example</name>
<description>This is sample source code on how to write a plugin for CloudStack</description>
<build>