You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2013/01/18 23:23:45 UTC
[12/50] [abbrv] git commit: Merge branch 'master' into api_limit
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/add_remove_nics
Commit: 97cb16944f85190738adb1f48b13bba807296efd
Parents: 3698d64 939acb0
Author: Min Chen <mi...@citrix.com>
Authored: Tue Jan 15 18:18:34 2013 -0800
Committer: Min Chen <mi...@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(-)
----------------------------------------------------------------------