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/11 18:31:46 UTC
[17/17] git commit: refs/heads/ui-multiple-nics - Merge branch
'master' into ui-multiple-nics
Updated Branches:
refs/heads/ui-multiple-nics fd7ce8bb8 -> 425f0bad8
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/425f0bad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/425f0bad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/425f0bad
Branch: refs/heads/ui-multiple-nics
Commit: 425f0bad81ffbe261d14b4940245565e28c2f588
Parents: fd7ce8b 85e9d63
Author: Brian Federle <br...@citrix.com>
Authored: Mon Mar 11 10:31:23 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Mar 11 10:31:23 2013 -0700
----------------------------------------------------------------------
LICENSE | 2 +-
.../cloud/agent/api/routing/DhcpEntryCommand.java | 10 +
.../command/admin/resource/ArchiveAlertsCmd.java | 100 ++++
.../command/admin/resource/DeleteAlertsCmd.java | 99 ++++
.../api/command/user/event/ArchiveEventsCmd.java | 105 +++++
.../api/command/user/event/DeleteEventsCmd.java | 105 +++++
.../api/command/user/iso/ListIsosCmd.java | 15 +-
.../virtualnetwork/VirtualRoutingResource.java | 4 +
packaging/centos63/cloud.spec | 5 +-
.../debian/config/etc/init.d/cloud-early-config | 4 +-
patches/systemvm/debian/config/root/edithosts.sh | 16 +-
.../hypervisor/vmware/resource/VmwareResource.java | 6 +-
.../hypervisor/xen/resource/CitrixHelper.java | 41 +-
.../xen/resource/CitrixResourceBase.java | 4 +
.../xen/resource/XenServer610Resource.java | 2 +-
pom.xml | 5 +
scripts/network/domr/dhcp_entry.sh | 6 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 4 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 3 +-
.../src/com/cloud/projects/ProjectManagerImpl.java | 3 +-
.../src/com/cloud/storage/VolumeManagerImpl.java | 8 +
server/src/com/cloud/user/DomainManagerImpl.java | 6 +-
.../cloudstack/region/RegionManagerImpl.java | 46 +--
.../com/cloud/alert/AlertControlsUnitTest.java | 83 ++++
.../com/cloud/event/EventControlsUnitTest.java | 84 ++++
tools/appliance/README.md | 4 +-
tools/appliance/build.sh | 10 +-
.../definitions/systemvmtemplate64/base.sh | 25 +
.../definitions/systemvmtemplate64/cleanup.sh | 21 +
.../definitions/systemvmtemplate64/definition.rb | 45 ++
.../definitions/systemvmtemplate64/postinstall.sh | 220 +++++++++
.../definitions/systemvmtemplate64/preseed.cfg | 357 +++++++++++++++
.../definitions/systemvmtemplate64/zerodisk.sh | 15 +
33 files changed, 1385 insertions(+), 78 deletions(-)
----------------------------------------------------------------------