Commit Graph

34084 Commits

Author SHA1 Message Date
alena a11b7de9fe Set firewall.rule.ui.enabled to false by default
Conflicts:

	server/src/com/cloud/configuration/Config.java
2011-08-25 16:12:55 -07:00
Kelven Yang 9ace681547 bug 11162: merge fix from 2.2.10 premium 2011-08-25 15:38:43 -07:00
Kelven Yang 97a7dddf7d bug 11162: support memory overprovisioning in VMware 2011-08-25 15:38:28 -07:00
Jessica Wang b6f715771e bug 11260: cloudStack - create system service offering dialog: add network rate field. 2011-08-25 15:26:36 -07:00
Osamu 02127db341 amended 2011-08-26 07:03:05 +09:00
Osamu 95e4f819c0 amended 2011-08-26 07:03:04 +09:00
Jessica Wang a3645e3e46 bug 11255: cloudStack - IP address page - add a missing semicolon. 2011-08-25 15:01:44 -07:00
frank a5a2c17df7 get rid of charva.jar 2011-08-25 14:49:10 -07:00
Jessica Wang e19cff6beb bug 11255: cloudStack - IP address page - Create Firewall rule - fix a bug on Google Chrome that changing protocol dropdown (e.g. from TCP to ICMP) wouldn't correctly hide/show related input fields. 2011-08-25 14:40:08 -07:00
Jessica Wang 91910dd50e bug 11255: cloudStack - IP address page - Create Firewall rule - fix a JavaScript syntax bug. 2011-08-25 14:39:44 -07:00
frank 492e05560a fix deps classpath 2011-08-25 14:32:25 -07:00
frank 9f74775cdc add dependent jar files 2011-08-25 14:32:24 -07:00
frank 902bcf969b Remove thirdparty 2011-08-25 14:32:24 -07:00
frank bb1b16c540 merge thridparty to deps 2011-08-25 14:32:19 -07:00
alena 35b551a199 bug 11260: Take networkRate for domR's guest and public interface from the corresponding system service offering 2011-08-25 14:15:12 -07:00
Kelven Yang fcd26a999b bug 11264: merge fix from 2.2.10 2011-08-25 13:58:56 -07:00
prachi 1fefdd628d Bug 11261 - Allow to update host tags
Changes:
- Changes to updateHostCmd to accepts hosttags parameter
- Changes to wipe out existing tags and save new ones in host_tags DB.
- UpdateHost is Admin only operation - so only root admin can update host tags
2011-08-25 13:01:57 -07:00
alena 8c53dbcdd7 bug 11185: support multiple CIDR on overlapping port ranges for firewall rules
status 11185: resolved fixed

Conflicts:

	server/src/com/cloud/network/firewall/FirewallManagerImpl.java

Conflicts:

	api/src/com/cloud/network/firewall/FirewallService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2011-08-25 12:21:11 -07:00
prachi 16986c01c8 Bug 9921 - template tags
-Added missing import statement.
2011-08-25 12:16:09 -07:00
prachi b6851e631e Bug 9921 - template tags
-Upgrade path from 2.2.10 to 2.2.11
2011-08-25 12:09:21 -07:00
prachi 05440f0905 Bug 9921 - template tags
Changes:
- CreateTemplate and RegisterTemplate now support adding a template tag. It is a string value. This is root-admin only action - only admin can add template tags.
- ListTemplates will return the template tag in response.
- HostAllocator changed to use template tag along with the existing tag on service offering. If both tags are present, allocator now finds hosts satisfying both tags. If no hosts have both tags, allocation will fail.
- DB changes to add new column to vm_template table.
- DB upgrade changes for upgrade from 2.2.10 to 2.2.11
2011-08-25 12:03:59 -07:00
Kelven Yang 6d6cc2ca54 Developer build fix after premium-move to FOSS 2011-08-25 10:19:01 -07:00
David Nalley 491606ceed Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-08-25 10:26:08 -04:00
Prasanna Santhanam 81366d35c1 a. Test Discovery is only found in python 2.7+. unittest2 makes it backwards compatible for python 2.4-2.6
b. Adding traceback from pymysql to debug problems in connecting with database
(cherry picked from commit 81218d718af0ec101f7ba424c62bb6e0b5642744)
2011-08-25 19:52:30 +05:30
Prasanna Santhanam 5ae45e4baf correcting indentation problems with python
(cherry picked from commit 6212443c37a85d335e835d690b4b33c10edb48c1)

Conflicts:

	agent-simulator/scripts/zucchini/setup.py
2011-08-25 19:52:15 +05:30
David Nalley 1699d7926a bug 11223: ensure all config files are %config(noreplace) in the spec
status 11223: resolved fixed
2011-08-25 10:19:39 -04:00
David Nalley 805022af7c bug 11258: add wget as a requires for cloud-agent-scripts
status 11258: resolved fixed
2011-08-25 10:12:09 -04:00
Nitin ece07d7d7f bug 11076: Improve logging - dont login the password in the logs.
status 11076: resolved fixed
2011-08-25 16:15:48 +05:30
Nitin 5923fe950b bug 11077: Improve logging - put in the hostid and hostname on which the vm launches.
status 11077: resolved fixed
2011-08-25 16:06:09 +05:30
Abhinandan Prateek cd01f7dab2 bug 11181: taking care of a boundary condition with 0 user VM 2011-08-25 15:38:48 +05:30
Naredula Janardhana Reddy 9feb05ac13 bug 10617: This is Intermediate commit for Egress rules implementation in security groups.
previous commit: c9fda641673df7701f44963ef27e1d488f121219 ( this under bug 1067, typing error)
        changes: 1) partially implemented  listing of egress rules along with ingress rules.
                 2) partially implemneted egress rules for KVM
2011-08-25 12:18:33 +05:30
Edison Su 9391938908 fix conflict 2011-08-24 18:47:09 -07:00
alena 0355c26f03 bug 11242: check if db object is already removed before generating the Debug log. It can happen in case when deleteHost command is called many times in parallel for the same host
status 11242: resolved fixed
2011-08-24 15:48:18 -07:00
Kelven Yang 1061738924 bug 11230, 11229: merge fix from 2.2.10 branch, fix Eclipse project settings for premium-move 2011-08-24 15:18:08 -07:00
Kelven Yang a51383e296 bug 11219: use local storage flag from service offering when it is ROOT disk 2011-08-24 15:17:53 -07:00
frank 6c4743a8b8 add missing test stuff back 2011-08-24 15:02:33 -07:00
alena ee9fbf10b6 Method signature change 2011-08-24 14:56:37 -07:00
alena e3f179844e bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands. Root admin can operate with other people templates w/o any restrictions.
status 11236: resolved fixed
2011-08-24 14:48:35 -07:00
Jessica Wang 9de41dd600 cloudStack - add new translation labels. 2011-08-24 14:23:10 -07:00
Jessica Wang 617cb5a058 cloudStack - pass "forVirtualNetwork=false" when creating IP range for public network in an security-group-enabled (advanced) zone. 2011-08-24 14:22:38 -07:00
frank 85f18ff256 fix build, add test rpm back 2011-08-24 13:24:51 -07:00
frank 74165ea477 fix build, add test rpm back 2011-08-24 13:17:27 -07:00
Edison Su 9a6fc7de45 bug 11217: add secondary storage id into snapshot, if it's an empty snapshot
status 11217: resolved fixed
2011-08-24 11:05:45 -07:00
alena 9544d42908 bug 11060: use lockTable instead of rowLock when createDomR/createDhcp
status 11060: resolved fixed
2011-08-24 11:01:23 -07:00
Edison Su 4393162ecd TestClient: fix npe 2011-08-24 10:48:26 -07:00
Edison Su 9a65935809 bug 11217: add secondary storage id into snapshot, if it's an empty snapshot
status 11217: resolved fixed
2011-08-24 10:48:10 -07:00
frank 86bcca210b move migration to tools directory 2011-08-24 10:46:55 -07:00
frank d36a988d84 move simulator/test to opensource 2011-08-24 10:37:30 -07:00
Nitin 4b6d072490 bug 10972: Improve logging - put in the hostid and hostname on which the vm launches.
status 10972: resolved fixed
2011-08-24 18:04:46 +05:30
root 01044c5b2d removing spurious debug statement 2011-08-24 16:47:29 +05:30