apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,952 Commits 304 Branches 324 Tags
Commit Graph

494 Commits

Author SHA1 Message Date
Min Chen
640fa6be76 Fix a bug in converting Enum type to String. 2013-02-07 12:23:57 -08:00
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 1b9e5c3006b5b9ee6b301d65fc8d81675914c826.

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 894cb8f7d9fc8b5561754a9fa541fef8f235148a 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