cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [9/9] git commit: Merge branch 'master' into api_limit
Date Wed, 16 Jan 2013 02:19:09 GMT
Updated Branches:
  refs/heads/api_limit 3698d64ba -> 97cb16944


Merge branch 'master' into api_limit


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/97cb1694
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/97cb1694
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/97cb1694

Branch: refs/heads/api_limit
Commit: 97cb16944f85190738adb1f48b13bba807296efd
Parents: 3698d64 939acb0
Author: Min Chen <min.chen@citrix.com>
Authored: Tue Jan 15 18:18:34 2013 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Tue Jan 15 18:18:34 2013 -0800

----------------------------------------------------------------------
 .../exception/CloudAuthenticationException.java    |    4 +-
 .../cloud/exception/CloudExecutionException.java   |   57 -----------
 api/src/com/cloud/exception/ErrorCode.java         |   52 ----------
 api/src/com/cloud/user/UserContext.java            |    4 +
 .../apache/cloudstack/api/ServerApiException.java  |    4 +-
 .../api/command/user/discovery/ListApisCmd.java    |    8 +--
 .../discovery/ApiDiscoveryServiceImpl.java         |   41 ++++----
 .../cloud/simulator/SimulatorRuntimeException.java |    4 +-
 pom.xml                                            |    4 -
 server/src/com/cloud/async/AsyncCommandQueued.java |    4 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |   33 +++----
 .../com/cloud/server/ConfigurationServerImpl.java  |    2 +-
 server/src/com/cloud/vm/dao/NicDao.java            |    2 -
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |    8 --
 tools/devcloud-kvm/devcloud-kvm-advanced.cfg       |   19 ++++
 tools/devcloud-kvm/devcloud-kvm.cfg                |   20 ++++
 tools/devcloud/devcloud-advanced.cfg               |   17 ++++
 tools/devcloud/devcloud-advanced_internal-mgt.cfg  |   17 ++++
 tools/devcloud/devcloud.cfg                        |   18 ++++
 .../utils/exception/CloudRuntimeException.java     |   48 ++++++++-
 .../HypervisorVersionChangedException.java         |    4 +-
 .../utils/exception/RuntimeCloudException.java     |   75 ---------------
 22 files changed, 182 insertions(+), 263 deletions(-)
----------------------------------------------------------------------



Mime
View raw message