You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2012/12/18 21:02:49 UTC
[5/8] git commit: Merge branch 'api_refactoring' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into
api_refactoring
Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 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/57eda4e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/57eda4e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/57eda4e3
Branch: refs/heads/api_refactoring
Commit: 57eda4e3f439864deaa006be801b6a2c34f0b575
Parents: 79f8c10 d54d8cb
Author: Min Chen <mi...@citrix.com>
Authored: Mon Dec 17 23:03:55 2012 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Mon Dec 17 23:03:55 2012 -0800
----------------------------------------------------------------------
client/tomcatconf/server-nonssl.xml.in | 4 +-
client/tomcatconf/server-ssl.xml.in | 2 +-
client/tomcatconf/server.xml.in | 4 +-
pom.xml | 3 +-
server/pom.xml | 5 ++
server/src/com/cloud/api/ApiServer.java | 61 +++++++++++++------------
utils/pom.xml | 5 ++
7 files changed, 49 insertions(+), 35 deletions(-)
----------------------------------------------------------------------