You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/01/05 02:23:35 UTC
[8/8] git commit: Get latest changes,
Merge branch 'master' into api_refactoring
Updated Branches:
refs/heads/api_refactoring 364116074 -> 0659c21f2
Get latest changes, Merge branch 'master' into api_refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0659c21f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0659c21f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0659c21f
Branch: refs/heads/api_refactoring
Commit: 0659c21f2d01242e9d17e1dd4497f60e18f1ba77
Parents: 3641160 c7563cb
Author: Rohit Yadav <bh...@apache.org>
Authored: Fri Jan 4 17:22:57 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Fri Jan 4 17:22:57 2013 -0800
----------------------------------------------------------------------
awsapi/pom.xml | 1 +
client/pom.xml | 1 +
server/pom.xml | 1 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
tools/cli/cloudmonkey/cloudmonkey.py | 30 ++++++++++-----
ui/css/cloudstack3.css | 1 -
ui/scripts/network.js | 4 +-
utils/pom.xml | 1 +
8 files changed, 27 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0659c21f/client/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0659c21f/server/pom.xml
----------------------------------------------------------------------
diff --cc server/pom.xml
index 1fd1831,f8a1ae0..b1a5d3d
--- a/server/pom.xml
+++ b/server/pom.xml
@@@ -43,13 -43,9 +43,14 @@@
<version>${cs.httpcore.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${cs.httpcore.version}</version>
+ </dependency>
+ <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <version>${cs.mysql.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0659c21f/utils/pom.xml
----------------------------------------------------------------------