You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/01/27 18:17:20 UTC
[2/15] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4ccbdbd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4ccbdbd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4ccbdbd2
Branch: refs/heads/events-framework
Commit: 4ccbdbd23d5cad290ec52d9a124370d1f23c29be
Parents: 285e821 a2b2d45
Author: Min Chen <mi...@citrix.com>
Authored: Thu Jan 24 16:46:10 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Jan 24 16:46:10 2013 -0800
----------------------------------------------------------------------
api/src/com/cloud/dao/EntityManager.java | 9 +++
.../api/BaseListAccountResourcesCmd.java | 2 +-
.../api/command/user/iso/AttachIsoCmd.java | 2 +-
.../api/command/user/iso/DetachIsoCmd.java | 2 +-
.../api/command/user/template/CopyTemplateCmd.java | 2 +-
.../command/user/template/DeleteTemplateCmd.java | 4 +-
.../command/user/template/ExtractTemplateCmd.java | 4 +-
.../api/command/user/vpc/ListVPCsCmd.java | 17 -----
.../discovery/ApiDiscoveryServiceImpl.java | 2 +-
server/src/com/cloud/api/ApiDispatcher.java | 19 +++---
server/src/com/cloud/api/doc/ApiXmlDocWriter.java | 20 +++---
server/src/com/cloud/dao/EntityManagerImpl.java | 7 ++
tools/cli/cloudmonkey/cloudmonkey.py | 42 +++++++++----
tools/cli/setup.py | 2 +-
ui/scripts/instanceWizard.js | 33 +++++++++-
ui/scripts/projects.js | 2 +-
ui/scripts/ui-custom/instanceWizard.js | 10 +++
utils/src/com/cloud/utils/IteratorUtil.java | 10 +++
utils/src/com/cloud/utils/ReflectUtil.java | 48 ++++++++++-----
utils/src/com/cloud/utils/db/GenericDao.java | 3 +
utils/src/com/cloud/utils/db/GenericDaoBase.java | 8 +++
21 files changed, 166 insertions(+), 82 deletions(-)
----------------------------------------------------------------------