You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/03/15 19:46:45 UTC
[31/50] git commit: refs/heads/Health-Check-UI - Merge branch
'master' into ui-multiple-nics
Merge branch 'master' into ui-multiple-nics
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4b26e9d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4b26e9d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4b26e9d8
Branch: refs/heads/Health-Check-UI
Commit: 4b26e9d89bb380e2fc28077b615ef43e71799814
Parents: 66a6520 7d0db5d
Author: Brian Federle <br...@citrix.com>
Authored: Thu Mar 14 10:45:27 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Mar 14 10:45:27 2013 -0700
----------------------------------------------------------------------
.gitignore | 1 +
api/src/com/cloud/domain/Domain.java | 1 -
api/src/com/cloud/user/Account.java | 2 -
api/src/com/cloud/user/AccountService.java | 4 +-
api/src/com/cloud/user/DomainService.java | 2 +-
api/src/com/cloud/user/User.java | 1 -
.../apache/cloudstack/api/ApiConstants.java.orig | 468 ---------------
.../command/admin/account/CreateAccountCmd.java | 15 +-
.../api/command/admin/domain/CreateDomainCmd.java | 9 +-
.../api/command/admin/region/AddRegionCmd.java | 16 +-
.../api/command/admin/region/UpdateRegionCmd.java | 15 +-
.../api/command/admin/user/CreateUserCmd.java | 9 +-
.../api/response/DomainRouterResponse.java | 5 +-
.../api/response/SecurityGroupResponse.java | 7 +-
.../cloudstack/api/response/UserVmResponse.java | 7 +-
.../cloudstack/api/response/VolumeResponse.java | 3 +-
api/src/org/apache/cloudstack/region/Region.java | 3 -
.../apache/cloudstack/region/RegionService.java | 8 +-
.../cloudstack/api/command/test/RegionCmdTest.java | 4 +-
core/src/com/cloud/user/AccountVO.java | 13 +-
core/src/com/cloud/user/UserVO.java | 13 +-
debian/changelog | 6 +
debian/cloudstack-management.install | 6 +-
debian/cloudstack-usage.postinst | 37 ++
debian/rules | 13 +-
docs/en-US/autoscale.xml | 6 +-
.../debian/config/etc/init.d/cloud-early-config | 4 -
.../kvm/resource/LibvirtComputingResource.java | 33 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 109 +++-
pom.xml | 462 +++++++--------
scripts/vm/network/security_group.py | 7 +-
server/conf/cloudstack-limits.conf.in | 21 +
server/conf/cloudstack-sudoers.in | 22 +
server/src/com/cloud/domain/DomainVO.java | 16 +-
.../src/com/cloud/projects/ProjectManagerImpl.java | 2 +-
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 24 -
server/src/com/cloud/user/AccountManager.java | 4 +-
server/src/com/cloud/user/AccountManagerImpl.java | 51 +--
server/src/com/cloud/user/DomainManager.java | 2 +-
server/src/com/cloud/user/DomainManagerImpl.java | 18 +-
.../apache/cloudstack/region/RegionManager.java | 6 +-
.../cloudstack/region/RegionManagerImpl.java | 345 +----------
.../cloudstack/region/RegionServiceImpl.java | 8 +-
.../src/org/apache/cloudstack/region/RegionVO.java | 27 +-
.../apache/cloudstack/region/RegionsApiUtil.java | 4 +-
.../com/cloud/user/MockAccountManagerImpl.java | 9 +-
.../test/com/cloud/user/MockDomainManagerImpl.java | 4 +-
.../cloudstack/region/RegionManagerTest.java | 17 +-
setup/bindir/cloud-setup-databases.in | 2 +-
setup/db/db/schema-40to410.sql | 9 +-
tools/eclipse/set-eclipse-profile.sh | 26 +
ui/scripts/docs.js | 53 ++
ui/scripts/events.js | 310 ++++++++++
usage/conf/db.properties.in | 29 +
usage/pom.xml | 20 +-
55 files changed, 980 insertions(+), 1338 deletions(-)
----------------------------------------------------------------------