frank 6aaf3d5ae0 Merge branch 'cvm' ...

Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java

2011-08-08 14:14:09 -07:00

..

account.jsp

bug 9419: CloudStack UI - Account page- add new action "Update Resource Count".

2011-06-17 10:51:59 -07:00

alert.jsp

bug 8360: Make default option in advanced search field capitalized.

2011-02-03 16:43:56 -08:00

cluster.jsp

Merge branch 'cvm'

2011-08-08 14:14:09 -07:00

dashboard.jsp

bug 8632: has been resolved

2011-02-22 17:32:45 -08:00

diskoffering.jsp

bug 9126: cloudStack UI - Add Disk Offering Dialog, Add Service Offering Dialog - rename "tags" to "storage tags".

2011-06-16 11:39:11 -07:00

domain.jsp

bug 9419: CloudStack UI - Domain page- add new action "Update Resource Count".

2011-06-17 10:32:55 -07:00

event.jsp

bug 9999: Fixed missing account field issue in Safari

2011-05-24 12:19:02 -07:00

globalsetting.jsp

bug 4556: network offering page, global settings page - localize action label and confirmation message.

2011-01-28 10:54:01 -08:00

host.jsp

Merge branch 'cvm'

2011-08-08 14:14:09 -07:00

instance.jsp

Two things:

2011-07-29 11:25:35 -07:00

ipaddress.jsp

bug 10801: cloudStack - IP Address page - Load Balancer tab - add Source CIDR.

2011-07-26 10:21:10 -07:00

iso.jsp

bug 10338: cloudStack - template page, ISO page - correct field label.

2011-07-25 17:34:21 -07:00

network.jsp

(1) cloudStack - network page - updateNetwork API has been changed from sync to async. Here is related UI change.

2011-07-22 13:46:23 -07:00

networkoffering.jsp

CloudStack UI - network offering page - "is redundant router (yes/no)" shouldn't allowed to be modified.

2011-06-15 18:14:52 -07:00

pod.jsp

Merge branch 'cvm'

2011-08-08 14:14:09 -07:00

primarystorage.jsp

bug 9126: cloudStack UI - Add Primary Storage Dialog - rename "tags" to "storage tags".

2011-06-21 16:17:55 -07:00

resource.jsp

Merge branch 'cvm'

2011-08-08 14:14:09 -07:00

router.jsp

CloudStack UI - router page - add Redundant grid row that indicates whether this router is redundant or not. And if it's, redundant state will be shown on UI.

2011-06-15 15:54:08 -07:00

secondarystorage.jsp

cloudStack - secondary storage page - remove Version grid row.

2011-07-08 14:47:17 -07:00

securitygroup.jsp

bug 9999: Fixed missing account field issue in Safari

2011-05-24 12:19:02 -07:00

serviceoffering.jsp

Bug 10418: cloudStack - service offering page, system service offering page - add "Host Tags" in details tab.

2011-07-22 15:32:09 -07:00

snapshot.jsp

bug 9999: Fixed missing account field issue in Safari

2011-05-24 12:19:02 -07:00

systemserviceoffering.jsp

Bug 10418: cloudStack - service offering page, system service offering page - add "Host Tags" in details tab.

2011-07-22 15:32:09 -07:00

systemvm.jsp

bug 8816: Added link local IP to the system VM UI

2011-04-04 10:01:33 -07:00

template.jsp

bug 10338: cloudStack - template page, ISO page - correct field label.

2011-07-25 17:34:21 -07:00

volume.jsp

bug 10519: volume page - Details tab - Create Template action - remove warning message on the top of dialog box.

2011-07-25 11:19:53 -07:00

zone.jsp

Merge branch 'cvm'

2011-08-08 14:14:09 -07:00