etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,763 Commits 323 Branches 325 Tags 908 MiB
Commit Graph

593 Commits

Author SHA1 Message Date
Edison Su 2ed94cbb64 fix compile 2013-02-26 21:44:44 -08:00
Edison Su 8e360f342d CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -08:00
Min Chen 17488fac36 Fix another toString() usage of GuestOsIdentifier enum. 2013-02-26 15:32:59 -08:00
Min Chen 8aba25f18d Merge branch 'master' into vim51_win8 
Conflicts:
	setup/db/db/schema-410to420.sql
 2013-02-26 14:12:36 -08:00
Min Chen 610088fb2d Use value() instead of toString() to convert guestOsIdentifier. 2013-02-26 13:29:02 -08:00
Rohit Yadav 8cb5c00c26 CLOUDSTACK-416: Add XCP 1.6.x in XcpServerDiscoverer.java processConnect 
Thanks to Devdeep for pointing this out.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c7935a9ab6)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-26 15:37:58 +05:30
Rohit Yadav 43183893bd CLOUDSTACK-416: Add XCP 1.6.x as supported hypervisor 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-26 13:55:43 +05:30
Sheng Yang 1b408509d6 CLOUDSTACK-1332: Add IPv6 DNS for Zone 2013-02-25 16:08:10 -08:00
frank cd291f6b4b From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001 
From: Vijayendra <vijayendra.bhamidipati@citrix.com>
Date: Mon, 25 Feb 2013 14:37:27 -0800
Subject: [PATCH] CS-670: Configurable setting to use linked clones or not on
 VMware

Description:

  Providing support for creation of user VMs as full clones on ESX.
  Putting in unit tests for VO and Dao classes introduced in this commit.

Signed-off-by: Vijayendra <vijayendra.bhamidipati@citrix.com>
---
 core/src/com/cloud/vm/UserVmCloneSettingVO.java    |  50 ++++++
 .../hypervisor/vmware/manager/VmwareManager.java   |   3 +
 .../vmware/manager/VmwareManagerImpl.java          |  18 +-
 .../hypervisor/vmware/resource/VmwareResource.java | 117 +++++++++----
 server/conf/migration-components.xml               |   1 +
 server/src/com/cloud/configuration/Config.java     |   1 +
 server/src/com/cloud/vm/UserVmManagerImpl.java     | 184 ++++++++++-----------
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java    |  37 +++++
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java    |  74 +++++++++
 .../vm/dao/UserVmCloneSettingDaoImplTest.java      |  62 +++++++
 .../UserVmCloneSettingDaoTestConfiguration.java    |  52 ++++++
 .../test/resources/CloneSettingDaoTestContext.xml  |  42 +++++
 setup/db/db/schema-410to420.sql                    |   9 +
 13 files changed, 527 insertions(+), 123 deletions(-)
 create mode 100755 core/src/com/cloud/vm/UserVmCloneSettingVO.java
 create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDao.java
 create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
 create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java
 create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java
 create mode 100644 server/test/resources/CloneSettingDaoTestContext.xml
 2013-02-25 14:57:57 -08:00
Min Chen fbfc5c6894 Merge from master and fix conflicts 2013-02-25 11:53:24 -08:00
Bharat Kumar 667aa17512 CLOUDSTACK 711: CPU and RAM overcommit update cluster part 2013-02-22 20:09:50 +05:30
Bharat Kumar 23e54bb0f4 Cloudstack-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
Mice Xia dae57c1ab2 add missing license header reported by rat 2013-02-22 13:22:14 +08:00
Edison Su 3bb713c5ce fix adding nfs primary storage and build and load 2013-02-21 16:24:39 -08:00
frank 8855d793ee CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

pass host id to baremetal discover when mgmt loads existing hosts
 2013-02-21 15:48:20 -08:00
frank 15ead099a1 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

able to start vm

Conflicts:

	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
	server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2013-02-21 15:48:08 -08:00
frank 55b77c7c8f CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

adding missing scripts back

Conflicts:

	client/pom.xml
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/server/ManagementServerImpl.java
 2013-02-21 15:46:11 -08:00
frank 1f15c1e9e7 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

fixing bugs to align to new code base

Conflicts:

	client/tomcatconf/componentContext.xml.in
 2013-02-21 15:42:38 -08:00
frank 54741a2b0f CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

add api annotation to baremetal related api
 2013-02-21 15:41:21 -08:00
Edison Su ff047e75d3 refactor snapshot, move existing snapshot code into its own snapshotstrategy 2013-02-21 11:22:49 -08:00
Edison Su a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Min Chen c9f0af42a6 Fix systemvm.iso path search issue. 2013-02-21 10:22:14 -08:00
Hugo Trippaers 368a5d5a9a Prachi's commit 20a747601c introduced a 
new call to network.getPhysicalNetworkId() which wasn't mocked yet in
the nvp plugin unittests.(cherry picked from commit aea5b268b4)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
 2013-02-21 14:08:56 +01:00
hongtu_zang f7b600b439 CLOUDSTACK-1334 global config vmware.root.disk.controller doesn't work 2013-02-21 11:29:08 +08:00
Prachi Damle ec1f48a4b2 CLOUDSTACK-1331: Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan 
Changes:
-We need to update the physical_network_id for public vlans.
-Physical network ID should be retrieved from the network if present.
 2013-02-20 11:23:32 -08:00
Rohit Yadav 80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-20 16:42:56 +05:30
Prasanna Santhanam edac894f31 spring changes for simulator component 
allow spring to do DI for simulator plugin. componentContext.xml will
have simulator components disabled by default.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-02-19 16:40:57 +05:30
Abhinandan Prateek f2b97db0f9 CLOUDSTACK-1172: LDAP enhancements 2013-02-19 15:36:39 +05:30
Kishan Kavala c94a75c0a6 CLOUDSTACK-752: Removed 1 private gateway for VPC limitation. 
Verified that more than 8 private gateways can be created.
 2013-02-19 14:15:02 +05:30
Kishan Kavala cc2a3c5498 CLOUDSTACK-651: Removed 7 nics limitation for VR on XenServer 
# of nics can be configured using global param xen.nics.max. Param defaults to 7
Added new param to upgrade schema.
 2013-02-18 20:30:03 +05:30
Min Chen 5147fb16ac CLOUDSTACK-1253: Remove @author tag. 2013-02-15 10:42:06 -08:00
Koushik Das bc493bd39b CLOUDSTACK-672: Set VMware cluster max. limit based on HV version 
Max. number of hosts in a Vmware clueter is specific to the version of the HV. This limit is read from the hypervisor_capabilities table
 2013-02-15 16:19:40 +05:30
Marcus Sorensen 298c5ee06b Summary: Adjust systemvm.iso path for KVM, due to packaging changes 
Detail: Removing references to /usr/lib/cloud and /usr/lib64/cloud so that old
systemvm.iso files aren't found by accident. systemvm.iso should exist in
/usr/share/cloudstack-common/vms now.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360860243 -0700
 2013-02-14 09:45:57 -07:00
Marcus Sorensen 35cf56862f Summary: KVM - Fix physical net parsing when traffic label points to tagged dev 
Detail: If your traffic label points to a bridge that is on a tagged interface
rather than a real physical interface, cloudstack may not parse the physical
interface correctly, bringing up tagged interfaces on the tagged interface.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360798665 -0700
 2013-02-13 16:45:18 -07:00
Alex Huang f542c320d3 Removed a bunch of missing files and useless imports 2013-02-13 15:41:27 -08:00
Mice Xia 9a12756ae4 CLOUDSTACK-684 support vm snapshot 2013-02-14 01:26:30 +08:00
Rohit Yadav 3a0c99b0a4 CLOUDSTACK-710: CitrixResourceBase, if dest dir is not found, mkdir -m 700 -p 
This is a security failsafe, so even if destination does not exist we mkdir the path
with 0700 permission. If path exists mkdir -m 700 -p won't do anything.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-13 22:45:32 +05:30
Rohit Yadav fcb4b7a6a7 CLOUDSTACK-1237: Fix an overriding method that would help find template adapter 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-13 15:19:30 +05:30
Min Chen 6320cad9a1 Merge branch 'master' into vim51_win8 2013-02-11 15:47:08 -08:00
Rohit Yadav 770860aee4 CLOUDSTACK-710: mkdir -p destination before scp-ing file in CitrixResourceBase 
- Assumption is that mkdir is available on xen host
- We don't know what kind of file we're copying, dirs would have 0777 permission
  by default

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-11 16:39:16 +05:30
Rohit Yadav b59a18d1a1 CLOUDSTACK-1210: Fix pluggable service, apiserver, mgmt server impl, api-discovery 
- Mgmt server impl is a pluggable service, fix it's method
- Fix getCommands() to return all cmd api classes supported by this mgmt server
- For api-discovery, get commands from pluggable services only, don't use reflections
- Don't use reflections in ApiServer, iterate pluggableservices
- Fix api discovery unit test
- The fix was done automatically using following python program along with
  following step:

1. Get all apis provided by default mgmt server, all of them are in cloud-api now
   cd api/src/org/apache/cloudstack/api/command
   find . >> apis
2. For all apis, generate java code that adds the class to the cmdList arraylist:
   f = open('apis', 'r')
   data = f.read()
   f.close()
   output = ""
   for a in data.split('\n'):
     output += "cmdList.add(%s);" % a.split('/')[-1].replace('.java', '.class')
   # wrote output to a file, copied content to mgmt server impl's getCommands()
   # similarly, fixed import statements using same code, splitting on /

Testing:
Ran apiserver, put breakpoints in ApiServer's init() where classes are processed
Total cmd classes found by reflections (ReflectUtil) = 354
Total cmd classes found by getCommands for all pluggable services = 354

Next, copied the comma separated values for each set to a string in ipython, a & b
set(a).difference(set(b)) returned null.

The above test implies both set of cmd classes found by both methods, i.e. using
reflections and using getCommands() had same set of apis and all were unique.

Conclusion:
The changes are idempotent and don't break api server's cmd class api discovery
processing.

BUG-ID: CLOUDSTACK-1210

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-08 16:48:13 +05:30
Rohit Yadav 3a0588f317 netapp: Fix as pluggable service and return list of apis it offers 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-08 16:36:24 +05:30
Rohit Yadav 41fc03d4e7 bigswitch-vns: Fix since version in apis, add spring annotation to fix NPE 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-08 16:36:24 +05:30
Min Chen 0b1e3a4af0 Move Api rate limit configurations from xml file to global 
configuration, and also modify listCapabilitiesCmd to also return api
limit interval and max for UI consumption.
 2013-02-08 00:02:25 -08:00
Min Chen d71cfc1aec Revert "CLOUDSTACK-1175: Fix NPE by making _store a static variable shared by objects" 
This reverts commit 9b691fc443.
 2013-02-07 21:49:37 -08:00
Wido den Hollander a5f0be186f agent: Rename startDomain to startVM 
The other methods are called stopVM and rebootVM, so it makes
sence to use startVM.
 2013-02-07 23:07:10 +01:00
Wido den Hollander 5dfcd309f1 agent: Do not define domains persistent in libvirt 
We used to define domains persistent in libvirt, which caused XML definitions
to stay there after a reboot of the hypervisor.

We however don't do anything with those already defined domains, actually, we wipe
all defined domains when starting the agent.

Some users however reported that libvirt started these domains after a reboot
before the CloudStack agent was started.

By starting domains from the XML description and not defining them we prevent
them from ever being stored in libvirt.
 2013-02-07 23:07:05 +01:00
Wido den Hollander f6c4b22139 agent: Remove the main() method from LibvirtComputingResource 
Seems like very ancient code which is not needed.
 2013-02-07 23:06:44 +01:00
Min Chen 640fa6be76 Fix a bug in converting Enum type to String. 2013-02-07 12:23:57 -08:00
Rohit Yadav 9b691fc443 CLOUDSTACK-1175: Fix NPE by making _store a static variable shared by objects 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-07 18:23:49 +05:30
Min Chen 105bf7134a Merge branch 'master' into vim51_win8 
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-02-06 15:27:45 -08:00
Marcus Sorensen c5185c09ef Summary: Add missing ResizeVolumeCommand in VmwareResource.java 
Submitted-by: hongtu_zang <hongtu_zang@tcloudcomputing.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
 2013-02-06 07:52:37 -07:00
Rohit Yadav 44316f7398 ApiDiscovery: Fix tests and make constructor light weight, let spring run init() 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-06 20:07:27 +05:30
Hugo Trippaers d296a8fa65 Revert "ApiDiscovery: Discovery apis provided by PluggableServices as well" 
This reverts commit 1b9e5c3006.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2013-02-06 14:17:22 +01:00
Rohit Yadav 1b9e5c3006 ApiDiscovery: Discovery apis provided by PluggableServices as well 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-06 16:54:46 +05:30
Kishan Kavala 2a0c2be136 CLOUDSTACK-1175: PlainTextAuthenticator was being loaded due @Component annotation. Removed the annotation so that MD5 authenticator will be used 2013-02-06 15:27:03 +05:30
Min Chen 5a2cd68fa8 Fix bug CLOUDSTACK-1171 due to spring injection. 2013-02-05 21:55:11 -08:00
Min Chen 1ce4d62ace Fix cast error from List<?> to array. 2013-02-05 21:44:38 -08:00
Min Chen b9cf5c2147 Merge branch 'master' into vim51_win8 2013-02-05 14:40:53 -08:00
Kelven Yang e5866cf2ef CLOUDSTACK-1165, fix nonoss build startup issue 2013-02-05 14:27:57 -08:00
Wido den Hollander 303fb650cb agent: Use FileUtil.readFileAsString for reading RX and TX bytes 
Since we already have this un utils it's better to use it here
then do the whole File/FileInputStream magic.

Keeps the code simpler and more readable.
 2013-02-05 22:17:40 +01:00
Marcus Sorensen 3535f88d16 Summary: Disallow shrinking volume type QCOW2 to fail with better message 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360093176 -0700
 2013-02-05 12:39:36 -07:00
Min Chen a224287403 Merge branch 'master' into vim51_win8 
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	pom.xml

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-02-05 10:05:39 -08:00
Kishan Kavala fc0bf21a13 CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:49:34 +05:30
Min Chen 481f480472 Upgrade to use Vsphere 5.1 SDK jar, fixed all compilation error with new 
wrapper class VmwareClient.
 2013-02-04 17:41:36 -08:00
Koushik Das ca56e7667c CLOUDSTACK-435: Vmware network labels are ignored when creating a Zone using basic networking 
Due to incorrect logic the private network traffic label specified was not getting used, instead some default was getting used (vSwitch0 or privateEthernetPortProfile). The fix passes the correct label in the format vSwitchX or vSwitchX,<vlan_id> and based on that the correct switch is used.
 2013-02-04 19:23:30 +05:30
Rohit Yadav fec9934656 ucs: Fix ucs plugin's pom, removes xml marktag 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-02 09:16:17 -08:00
Wido den Hollander 4709756bd5 agent: Use FileInputStream for reading files instead of cat 
Cat'ing a file and parsing that output is not reliable and this can be done
by using Java's native methods for that.
 2013-02-02 18:08:24 +01:00
Rohit Yadav c9e764818b rat: Fix license headers on ucs plugin etc. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-02 08:57:16 -08:00
Hugo Trippaers 9755d9b4a2 Keep naming more or less consistent 2013-02-02 12:43:15 +01:00
Kelven Yang 296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Kelven Yang 7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Murali Reddy bfc4f982fd adding missing license in one of the files of BigSwitch 2013-02-01 13:32:13 +05:30
Kanzhe Jiang 736b236eaf bigswitch controller support 
Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>

Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
 2013-02-01 12:42:04 +05:30
Murali Reddy 96c24930ae Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2013-02-01 08:45:53 +05:30
Kelven Yang 7bd8bec68a Sync javelin with master up to 894cb8f7d9 2013-01-31 17:20:19 -08:00
Sheng Yang 5cb9df91a1 Merge branch 'ipv6' 
Conflicts:
	api/src/com/cloud/network/NetworkProfile.java
 2013-01-31 15:07:33 -08:00
frank 8416d81b99 Merge branch 'ucs' into javelin 
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	plugins/pom.xml
	utils/src/com/cloud/utils/exception/CloudRuntimeException.java
	utils/src/com/cloud/utils/exception/RuntimeCloudException.java
 2013-01-31 14:44:07 -08:00
Min Chen 8f33229fc1 Merge branch 'master' into vim51_win8 2013-01-31 14:04:38 -08:00
Murali Reddy e7a554fc6a Merging events framework branch into master. This commit will bring 
following changes

   - introduced notion of event bus with publish, subscribe, unsubscribe
     semantics

   - a plug-in can implement the EventBus abstraction to provide event
     bug to CloudStack

   - A rabbitMQ based plug-in that can interact with AMQP servers to
     provide message broker based event-bug

   - stream lines, action events, usage events, alerts publishing in to
     convineance classed which are also used to publish corresponding
     event on to event bus

   - introduced notion of state change event. On a state change, in the
     state machine corrsponding to the resource, a state change event is
     published on the event bug

   - associated a state machined with Snapshot and Network objects

   - Virtual Machine, Volume, Snaphost, Network object state changes wil
     result in a state change event
 2013-02-01 01:37:24 +05:30
Kelven Yang 1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Min Chen 780ac2a9c6 Introduce POM dependency on VSphere 5.1 SDK, not done yet, WIP. 2013-01-31 10:32:05 -08:00
Jayapal b6727e5646 CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
Rohit Yadav d7ad2da7e0 server: Fix network refactor regressions for CLOUDSTACK-297 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-30 17:33:53 -08:00
Kelven Yang 176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
David Nalley 1b39b0e908 fixing licensing headers 2013-01-29 23:45:11 -05:00
frank 1f7eaf3d61 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

merge baremetal feature to master
 2013-01-29 17:19:57 -08:00
Min Chen 85de14f6a4 Increase sleep time to allow token expire to account for windows 
environment clock issue.
 2013-01-29 11:19:09 -08:00
Min Chen 1c20c80cb5 Fix unit test failure only on Windows environment. 2013-01-29 11:09:06 -08:00
Marcus Sorensen 1f2147d3ec Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
 2013-01-28 21:20:03 -08:00
Marcus Sorensen 482ce5fe07 Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
 2013-01-28 21:21:30 -07:00
frank 1a1d716d90 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS
 2013-01-28 16:30:06 -08:00
frank 997e9fb7b0 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS
 2013-01-28 16:29:54 -08:00
Sheng Yang 8f66d266b3 IPv6: Enable VR's ability to provide DHCPv6 service 2013-01-26 23:14:42 -08:00
Sheng Yang 9300a02ba4 IPv6: Update edithosts.sh accept parameters 2013-01-26 23:14:27 -08:00
Kelven Yang 767f54cc9a Make nonoss build work under Spring 2013-01-25 17:18:36 -08:00
Kelven Yang af4485ae9e Put nonoss under Spring framework 2013-01-25 15:41:48 -08:00
frank 301b0b9090 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS

init
 2013-01-25 15:00:09 -08:00
Edison Su a18baf8c83 fix compile 2013-01-25 10:24:25 -08:00
Rohit Yadav f56b96ad19 merge: Fast forward merge branch 'javelin' 
FF merge commit due to recent merge of master and then Edison's commit.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 19:30:28 -08:00