etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,479 Commits 324 Branches 325 Tags 861 MiB
Commit Graph

36479 Commits

Author SHA1 Message Date
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 2f1e5504fb Revert "handle empty snapshot correctly" 
This reverts commit 99f985783e960d1ef8712c8ff724862f688b461e.
 2011-10-31 14:30:09 -07:00
anthony 9225e8d2d4 Revert "bug 6876: netscaler integration" 
This reverts commit 72a267b69f80cd0accf455c7c3444e2e1f30e123.
 2011-10-31 14:26:27 -07:00
prachi 549c7d2ef9 Added NetworkElement API's isReady() and shutdownProviderInstances() called by NetworkMgr while enabling/shutdown the service provider. 2011-10-31 13:09:54 -07:00
anthony 42a3f0041a handle empty snapshot correctly 2011-10-31 11:42:58 -07:00
anthony 9a668416f8 Swift: List ISO fix 2011-10-31 11:10:28 -07:00
prachi 818df189c5 changes to Create Vlan & Public IPs 2011-10-31 09:53:25 -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
Murali Reddy e449067a4a Bug 9831: Implement resourceCount periodic task that would check if the count in resource_count table matches actual resource count 
status 9831: resolved fixed

   added a periodic task that does recalculation of counts. By default interval is set to 0, which will be interpreted as not to run task
 2011-10-31 18:26:21 +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
Abhinandan Prateek 6632145c4d bug 8962: adding file 2011-10-31 17:45:00 +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
kishan f34ec52031 Removed unused variable trafficSentinelHostname 2011-10-31 17:13:15 +05:30
Nitin bbbfdd52ec bug 10848: Minor fixes. 2011-10-31 17:00:11 +05:30
Abhinandan Prateek abb37acbdd bug 8962: added usage related and resource count related code, changed the API name as suggested. Incorporated relevant review comments 2011-10-31 16:35:42 +05:30
Abhinandan Prateek 932e3c3a65 bug 11311: incremental checkin 2011-10-31 12:27:17 +05:30
Abhinandan Prateek 07e44e3a23 bug 11311: change list vm call to provide less info 2011-10-30 16:25:57 +05:30
root a572205e3c Revert "bug 11311: vm summary command initial impl" 
This reverts commit 0abc7e2ea8b9e222f1927aea72d46240bfe8c534.
 2011-10-30 15:13:58 +05:30
Nitin 2b370ab535 bug 10657: Introducing cluster level global thresholds for cpu and ram so that these resources do not go beyond these thresholds. The reason for this is because, if the admn needs to provide maintenance, they don't have to add new machines or have ones on standby if the entire zone/pod/cluster is at 100% allocated capacity. Also introducing pool level global thresholds for allocated storage. There are other changes like DB upgrade and introduction of transaction. 2011-10-29 16:51:37 +05:30
frank 3e5f63f08b Bug 11863 - OVM - attempt to add host which is already added to same or different cluster does not generate UI error 
status 11863: resolved fixed
 2011-10-28 17:41:15 -07:00
anthony 4a3deefd02 Swift : template sync fix 2011-10-28 16:49:24 -07:00
anthony 2b039530c0 Swift : list Template 2011-10-28 16:07:31 -07:00
frank 3f630ebe08 add upgrade path from 2.2.x to 2.2.13 for baremetal 2011-10-28 14:30:57 -07:00
frank fec9cc86af allow multiple clusters for baremetal 2011-10-28 13:47:21 -07:00
frank 1ef620121a Use constant string instead of hard coding in baremetal parameters passing 
Conflicts:

	server/src/com/cloud/baremetal/BareMetalDiscoverer.java
 2011-10-28 11:07:28 -07:00
Nitin 0d1f89f507 bug 10530: Add vmid in the logs 2011-10-28 23:36:07 +05:30
Nitin 5ffbf711fe bug 11739: Fix typo 2011-10-28 23:33:52 +05:30
alena 7b982efeaa Fixed Advance zone creation with security group enabled 2011-10-28 10:24:37 -07:00
alena 6445bf4c49 Added services/capabilities to the SecurityGroupElement 2011-10-28 09:52:40 -07:00
Abhinandan Prateek f456462443 bug 11311: vm summary command initial impl 2011-10-28 14:07:19 +05:30
Abhinandan Prateek 3cb1426a6c bug 10588: sending cluster sync only for xen 2011-10-28 11:39:22 +05:30
frank d1084bb383 fix unable to find built-in template 2011-10-27 19:19:19 -07:00
alena b413a625f4 1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command 
2) Added deleteProjectInviation command. Can be executed by project admin only
 2011-10-27 18:32:00 -07:00
frank eb0fdc2925 allow multiple clusters for baremetal planner 
fix build
 2011-10-27 17:46:54 -07:00
prachi 1583211352 Fixing build after removing physicalNetworkId from createvlanIpRangeCmd 2011-10-27 17:42:42 -07:00
frank c81477a25c allow multiple clusters for baremetal planner 
Conflicts:

	server/src/com/cloud/deploy/BareMetalPlanner.java
 2011-10-27 17:39:14 -07:00
prachi 6d5601a84d Added commands and framework for PhysicalNetwork trafficTypes 2011-10-27 17:32:15 -07:00
frank 171e11a89b fix deploydb due to new agent manager merge 2011-10-27 17:18:18 -07:00
alena d315e57b0e Renamed "type" to "guestType" 2011-10-27 16:51:42 -07:00
alena fe0b685e95 Security group is a service now 2011-10-27 16:49:20 -07:00
alena 71b53a3432 Made isSharedSourceNatService a capability of SoureNatService 2011-10-27 16:49:20 -07:00
Sheng Yang 02ada73d89 NaaS: Make applyIp() as a function of FirewallServiceProvider 2011-10-27 16:45:40 -07:00
Sheng Yang bf4e21f315 NaaS: Destroy virtual router when cleanup=true at shutdown 
As we did in the restart() function.
 2011-10-27 16:45:34 -07:00
frank 9e88c40ab0 clean out various interface from agent manager to decent managers 2011-10-27 16:06:51 -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
Sheng Yang e1e96c0bb3 NaaS: Add ServiceProviders 
Added PortForwardingServiceProvider, StaticNatServiceProvider, rename
PasswordServiceProvider to UserDataServiceProvider(may rename to a better name
later).

Add related function for service providers.
 2011-10-27 11:55:10 -07:00
Sheng Yang b369e45c78 NaaS: Remove some configure items for virtual router 
DHCP range, domain name, etc. are the property of network, not virtual router
specific.

The focus of virtual router configuration would on separate enable/disable each
service it provided.
 2011-10-27 11:55:03 -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