apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,897 Commits 307 Branches 324 Tags
Commit Graph

952 Commits

Author SHA1 Message Date
Naredula Janardhana Reddy
f1b99f4f07 Revert "bug 10617: merging code from branch bug10617" 
This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2011-11-11 20:23:26 +05:30
Abhinandan Prateek
eefeee72ae bug 11979: if a VM is absent on the cluster, it is effectively in stopped state. 
reviewed-by: kishan
 2011-11-11 10:55:15 +05:30
Sheng Yang
bde1f6d2de Merge branch 'networkasservice' 
Conflicts:
	api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
	api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	setup/db/create-schema.sql
 2011-11-10 16:36:08 -08:00
Alex Huang
d6c22c42fe Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-11-10 15:26:39 -08:00
Alex Huang
f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Murali Reddy
122b62066a bug 11817: NAAS: device allocation logic 
- adding a allocation state to device
 - change device allocation logic based on network offering  and device state
 2011-11-10 09:55:23 -08:00
Naredula Janardhana Reddy
02adbd4bd3 bug 10617: merging code from branch bug10617 2011-11-10 15:23:48 +05:30
Sheng Yang
9b8f96c06d NaaS: Merge Role.DHCP_USERDATA and Role.DHCP_FIREWALL_LB_USERDATA to Role.VIRTUAL_ROUTER 2011-11-09 17:09:17 -08:00
anthony
548839e3bb bug 11903: create local link when host is connected 
status 11903: resolved fixed
 2011-11-04 20:39:05 -07:00
prachi
5f93665a30 - Send network labels to hypervisor recource during processConnect 
- Create Default physicalnetwork and add traffic types while creating a zone
- DeleteProvider should error out if there are networks using the provider.
- Other validations
 2011-11-04 17:57:05 -07:00
Kelven Yang
2b6f3d458e UUID support for XML responses 2011-11-04 17:38:22 -07:00
Abhinandan Prateek
dc0f798b26 bug 11800: checking for null value 2011-11-04 18:16:53 +05:30
frank
92edf56ccc Bug 7883 - Add support to allow admins to sort templates, isos, offerings... 
status 7883: resolved fixed
 2011-11-03 10:54:00 -07:00
Kelven Yang
924e556c95 bug 6745: Using UUID instead of integers - for all commands 2011-11-03 07:34:00 -07:00
Kelven Yang
8d8775b533 bug 6745: Using UUID instead of integers - for Async Jobs 2011-11-03 07:33:58 -07:00
Kelven Yang
fa2dd8e93a bug 6745: Using UUID instead of integers - for VM instances 2011-11-03 07:33:56 -07:00
Edison Su
6841e265d3 bug 10330: finally merge Rommer's CLVM patch 
status 10330: resolved fixed
 2011-11-02 18:03:58 -07:00
keshav
2a961c326d Account for high-order/low-order integers being signed. 2011-11-01 15:57:09 -07:00
keshav
2bfcb3e27b Changed F5 usage code to work with iControl API's high-order/low-order integers. 2011-10-31 16:20:25 -07:00
anthony
46dac852fa Merge branch 'swift' 
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2011-10-31 15:04:48 -07:00
anthony
9225e8d2d4 Revert "bug 6876: netscaler integration" 
This reverts commit 72a267b69f80cd0accf455c7c3444e2e1f30e123.
 2011-10-31 14:26:27 -07:00
Murali Reddy
0eb468ca90 bug 6876: netscaler integration 
fixing a bug in updating deployed lb rule parameters
 2011-10-31 19:01:52 +05:30
kishan
0d4971b34e bug 10307: Aggregate network r/w bytes on all interfaces 
status 10307: resolved fixed
 2011-10-31 18:01:26 +05:30
kishan
284ee3909e bug 9842: Added task to update user stats agg bytes in sync with aggregation range 
status 9842: resolved fixed
 2011-10-31 17:15:36 +05:30
anthony
2b039530c0 Swift : list Template 2011-10-28 16:07:31 -07:00
anthony
4116d0d4e4 Swift : bug fix 2011-10-27 16:04:18 -07:00
keshav
05560d2222 When deleting proxy ARP entries, first check that no static/source/destination NAT rules use them 2011-10-27 14:59:22 -07:00
anthony
d1141aff7d Swift : add Swift api 2011-10-27 11:48:48 -07:00
frank
21de281276 Fix broken compilation by new anget manager merge 2011-10-27 11:24:10 -07:00
frank
cef30956e9 Merge branch 'newagentmgr' 
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
 2011-10-27 11:09:56 -07:00
Abhinandan Prateek
a1a0fdc0a3 bug 10588: making sure the vms are synced during a delta also 2011-10-27 15:56:53 +05:30
Abhinandan Prateek
57ac50799b fixed a typo 2011-10-27 13:45:22 +05:30
Nitin
f85d558b6e bug 10774: Introduce percentage in list commands and cluster id in alert table 2011-10-27 11:23:57 +05:30
Nitin
b336a8b813 bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows. 2011-10-27 11:23:43 +05:30
Nitin
4b21650e23 bug 10848: Removing NPE from listCapacity and new alert code. Adding CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP. Introducing thresholds for vlan and direct attached public ips. 2011-10-27 11:21:50 +05:30
frank
1883afeaa3 Bug 11522 - New agent manager 
add update count into host table in order to make agent status update atomic
 2011-10-26 16:14:57 -07:00
Murali Reddy
a48ee9c568 add support for multiple provider instanes per physical network 
refactor NetworkDevicemanager and ExternalnetworkdeviceManager in to one single manager
 2011-10-27 03:07:30 +05:30
anthony
b91dce4f8a Swift: add listtemplate for swift 
add swift configuration
 2011-10-25 20:21:27 -07:00
anthony
510d1dbef7 Swift : upload template to Swift and sync between Swift and secondary storage 2011-10-24 18:48:16 -07:00
alena
75c8e33226 Removed guestIpType from network/networkOffering 2011-10-24 17:05:00 -07:00
frank
30f95e638a Bug 11522 - New agent manager 
1. get rid of host allocation state
2. remove Updating status from agent status
 2011-10-24 16:49:32 -07:00
Edison Su
92eaf49f29 Add storage migration 2011-10-24 15:59:47 -07:00
Kelven Yang
fc3d93e3e7 bug 9614: let root volume use IDE disk controller by default to ensure backwards compatibility with existing CloudStack deployments 2011-10-24 15:28:51 -07:00
kishan
83b4d2f7f9 bug 5822, 10783: Security enhancements initial checkin. Added encryption support to db.properties and some DB values. 2011-10-24 10:26:02 +05:30
anthony
0df249172d Swift: DeleteSnapshotBackupCommand and DeleteSnapshotsDirCommand are executed in SSVM 2011-10-21 19:53:48 -07:00
Kelven Yang
443c175793 bug 9614: enable SCSI device controller for root disk.(default root disk controller type can be conifgured through global configuration) 2011-10-21 18:44:56 -07:00
anthony
6c5c24dd6b swift: create volume from template works 2011-10-21 12:53:58 -07:00
Sheng Yang
fdc354adb5 NaaS: Add VirtualRouterElements table 
It would cover the configuration of DHCPElement, VirtualRouterElement and
RedundantVirtualRouterElement.

Also add foreign key in domain_router table to reflect the domain_router is
created from which element and use what configuration.
 2011-10-20 13:59:02 -07:00
Abhinandan Prateek
1ea9b5d703 bug 10588: putting config param for cluster sync intervals 2011-10-20 10:51:40 +05:30
anthony
c97010a160 BackupSnapshot to Swift 2011-10-18 18:11:09 -07:00