rebase to master

This commit is contained in:
Edison Su 2013-02-20 13:42:04 -08:00
parent 9b5774363d
commit 8eca74134a

View File

@ -15,7 +15,7 @@
<parent> <parent>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId> <artifactId>cloudstack-framework</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@ -24,7 +24,7 @@
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-utils</artifactId> <artifactId>cloud-utils</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.2.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>