Hey all, Just a reminder; Master and 4.1 are starting to diverge, this is not necessarily a bad thing at this time, but please make sure that any fixes you make for 4.1 are pushed into both trees.
[spark@cloudstack-dev5 incubator-cloudstack]$ git status # On branch 4.1 nothing to commit (working directory clean) [spark@cloudstack-dev5 incubator-cloudstack]$ git diff --stat master agent/test/com/cloud/agent/TestAgentShell.java | 2 +- .../cloud/exception/PermissionDeniedException.java | 4 + .../com/cloud/exception/RequestLimitException.java | 3 +- api/src/org/apache/cloudstack/acl/APIChecker.java | 3 +- docs/en-US/Admin_Guide.xml | 2 +- docs/en-US/Book_Info.xml | 2 +- docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 5 +- docs/en-US/Developers_Guide.xml | 2 +- docs/en-US/Installation_Guide.xml | 2 +- .../change-network-offering-on-guest-network.xml | 4 +- docs/en-US/creating-network-offerings.xml | 2 +- docs/en-US/hypervisor-host-install-libvirt.xml | 12 +- docs/en-US/prepare-system-vm-template.xml | 29 +- docs/en-US/security-groups.xml | 2 +- ...pgrade-virtual-router-with-service-offering.xml | 3 +- packaging/centos63/cloud.spec | 3 +- .../ratelimit/ApiRateLimitServiceImpl.java | 2 +- .../networkservice/AddBaremetalDhcpCmd.java | 3 +- .../AddBaremetalKickStartPxeCmd.java | 3 +- .../networkservice/AddBaremetalPxeCmd.java | 2 +- .../networkservice/BaremetalDhcpResponse.java | 4 + .../BaremetalPxeKickStartResponse.java | 5 +- .../networkservice/BaremetalPxePingResponse.java | 4 +- .../networkservice/ListBaremetalDhcpCmd.java | 3 +- .../ListBaremetalPxePingServersCmd.java | 3 +- .../kvm/resource/LibvirtComputingResource.java | 149 +++- scripts/storage/secondary/cloud-install-sys-tmplt | 16 +- scripts/vm/hypervisor/xenserver/vmops | 1 - server/src/com/cloud/api/ApiServer.java | 20 +- .../src/com/cloud/network/NetworkManagerImpl.java | 13 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 31 +- tools/apidoc/generateadmincommands.xsl | 2 +- tools/apidoc/generatedomainadmincommands.xsl | 2 +- tools/apidoc/generatetoc_header.xsl | 2 +- tools/apidoc/generateusercommands.xsl | 2 +- .../appliance/definitions/systemvmtemplate/LICENSE | 21 - .../appliance/definitions/systemvmtemplate/base.sh | 45 - .../definitions/systemvmtemplate/cleanup.sh | 37 - .../systemvmtemplate/cloudstack-packages.sh | 151 ---- .../definitions/systemvmtemplate/config.dat | 878 -------------------- .../definitions/systemvmtemplate/definition.rb | 6 +- .../definitions/systemvmtemplate/postinstall.sh | 46 +- .../definitions/systemvmtemplate/preseed.cfg | 16 +- .../definitions/systemvmtemplate/zerodisk.sh | 23 - .../cloud/utils/component/ComponentContext.java | 7 +- 45 files changed, 264 insertions(+), 1313 deletions(-) Cheers, Hugo
