cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/master to 7072d8d
Date Thu, 16 Oct 2014 13:26:22 GMT
PR: #23 Merge 4.5 back into master from 'DaanHoogland/merge-master'

Fixes #23

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7072d8d7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7072d8d7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7072d8d7

Branch: refs/heads/master
Commit: 7072d8d701ceca04857962d3af0a954bdaf7f205
Parents: 20d3cf1 148efbb
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Thu Oct 16 18:52:11 2014 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Thu Oct 16 18:54:06 2014 +0530

----------------------------------------------------------------------
 api/src/com/cloud/event/EventTypes.java         |   1 -
 .../PrepareKickstartPxeServerCommand.java       |  84 ++++++
 .../core/spring-baremetal-core-context.xml      |   8 +-
 .../baremetal/manager/BaremetalManager.java     |   3 -
 .../baremetal/manager/BaremetalManagerImpl.java |   3 -
 .../baremetal/manager/BaremetalVlanManager.java |   1 -
 .../manager/BaremetalVlanManagerImpl.java       |   7 +-
 .../networkservice/BareMetalResourceBase.java   |  47 +--
 .../BaremetalKickStartPxeResource.java          |   1 +
 .../BaremetalKickStartServiceImpl.java          |  12 +-
 .../networkservice/BaremetalPxeElement.java     |   5 +-
 .../Force10BaremetalSwitchBackend.java          | 116 ++------
 .../PrepareKickstartPxeServerCommand.java       |  83 ------
 .../BaremetalProvisionDoneNotificationCmd.java  |  87 ------
 server/src/com/cloud/configuration/Config.java  |  36 +--
 .../deploy/DeploymentPlanningManagerImpl.java   |  11 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   2 -
 .../com/cloud/resource/ResourceManagerImpl.java |  15 +
 .../com/cloud/storage/VolumeApiServiceImpl.java |  12 +-
 .../cloud/storage/VolumeApiServiceImplTest.java |  24 +-
 .../patches/debian/config/etc/dnsmasq.conf.tmpl |   6 +-
 .../config/opt/cloud/bin/baremetal_snat.sh      |  21 +-
 .../debian/config/opt/cloud/bin/prepare_pxe.sh  |  28 +-
 .../component/test_deploy_vgpu_vm.py            | 291 ++++++++++++++++++-
 .../com/cloud/utils/xmlobject/XmlObject.java    |  15 +-
 .../cloud/utils/xmlobject/XmlObjectParser.java  |  22 +-
 .../cloud/utils/xmlobject/TestXmlObject.java    |   5 -
 27 files changed, 486 insertions(+), 460 deletions(-)
----------------------------------------------------------------------



Mime
View raw message