Commit Graph

12490 Commits

Author SHA1 Message Date
Brian Federle c87501d8ae Fix placement of header 2012-07-10 14:58:06 -07:00
Brian Federle 5b8f5d6ae3 multiEdit: Correctly pass context to header fields 2012-07-10 14:57:07 -07:00
Brian Federle dd52157f09 Add code to show/hide 'tiers' header fields 2012-07-10 14:57:07 -07:00
Brian Federle 5fa4f4cf37 Pass mulit-edit form data to add VM dialogs, as part of context 2012-07-10 14:57:06 -07:00
Brian Federle 04ac28202f Multi-edit: refactor form serialization
To support header-level form items, serialize every form within the
multi-edit div (not just the main table form). For reusability, make
data serialization handled in separate 'getMultiData' function.
2012-07-10 14:57:06 -07:00
Brian Federle 7de02b6d5c Update dummy tier data 2012-07-10 14:57:05 -07:00
Brian Federle 081f1e335d Add header fields 2012-07-10 14:57:05 -07:00
Brian Federle b000b8047e CS-15475: Fix missing 'add guest network' action from network list
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
2012-07-10 11:24:07 -07:00
Edison Su 3bbb694413 For devcloudsetup.sh:
Added dom0 memory settings to grub config.
    Added root password reset.
    Install xen ia32 instead of amd64, to 32bit compability
Send-by: chip.childers@sungard.com
RB: https://reviews.apache.org/r/5877/
2012-07-10 11:18:32 -07:00
Pranav Saxena 9eebdd808d CS-15475:Not showing Add GuestNetwork Tab in Network in multi zone setup of advanced and basic zones together 2012-07-10 15:40:14 +05:30
Pranav Saxena 692e8fb98c Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-10 15:36:24 +05:30
Chip Childers 7488b9d752 For devcloudsetup.sh:
Added dom0 memory settings to grub config.
Added root password reset.
2012-07-09 23:27:01 -04:00
Chip Childers c06d319ef4 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-09 22:54:01 -04:00
Deepti Dohare 29e90f8358 CS-15429: When an instance is created with data volume, account limit for this data volume was not checked against. Adding a check for that.
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-10 06:02:30 +05:30
Brian Federle ccf2851ca6 CS-12739: VM wizard: add asterisk next to network 'name' field
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
2012-07-09 16:41:14 -07:00
Pranav Saxena e91dd3e653 CS-12739:DeployvM wizard when choosing to Add a new network if user does not provide the network name then clicking on Next does nothing 2012-07-10 04:43:01 +05:30
Brian Federle 10e70bcb9c CS-15392: Add error handling to edit user action
Original patch by: Olga Smola <olya.smola@gmail.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
2012-07-09 14:54:15 -07:00
Chip Childers 20bbaf01ce Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-09 16:42:16 -04:00
Edison Su fa414bbf0a It's due to replace.properties is missing, by default the password is cloud for user cloud
Revert "removing unneeded password from cloud-dev setup-script"

This reverts commit f157b702e4.
2012-07-09 11:48:43 -07:00
Edison Su fe15da5e3e add replace.properties back 2012-07-09 11:47:10 -07:00
Chip Childers 444dba6edd Fixed origin merge cleanup error. 2012-07-09 11:49:22 -04:00
Chip Childers 082d5634d1 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Conflicts:
	server/src/com/cloud/netapp/NetappAllocator.java
	server/src/com/cloud/netapp/dao/LunDao.java
	server/src/com/cloud/netapp/dao/PoolDao.java
	server/src/com/cloud/netapp/dao/VolumeDao.java
	server/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java
	server/src/com/cloud/servlet/ConsoleProxyClientParam.java
	server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java
	server/src/com/cloud/servlet/ConsoleProxyServlet.java
	server/src/com/cloud/storage/dao/VolumeHostDao.java
	server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
2012-07-09 11:48:34 -04:00
David Nalley f157b702e4 removing unneeded password from cloud-dev setup-script 2012-07-08 22:14:20 -04:00
Alena Prokharchyk 63d6941bdc ResourceTags: respect tag parameter in listTemplates/listIsos commands
Conflicts:

	server/src/com/cloud/storage/dao/VMTemplateDao.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
2012-07-06 16:59:14 -07:00
Likitha Shetty 8d38f4e051 CS-15167: AWS API calls do not honor the "admin" accounts ability to view/act on the resources owned by regular users. 2012-07-06 16:00:27 -07:00
David Nalley 47ea9f254c Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-06 17:28:38 -04:00
Pradeep Soundararajan 32fef61ac2 [Defect / Enhancement / New Feature] CS-15281 : Removal of third party dependencies in Citrix code base 2012-07-06 17:28:29 -04:00
Brian Federle ca231fe8be CS-15401: Fix arrow BG for PF/LB UI for Japanese language
When opening Network screen, arrows to the right side of "show all"
for firewall, load balancer and port forwarding are divided in
Japanese localized environment. This fix adjusts the CSS to fit longer
characters in this condition.

Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
2012-07-06 14:04:08 -07:00
Alena Prokharchyk 85677b71fe Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
Conflicts:

	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
2012-07-06 11:43:31 -07:00
Alena Prokharchyk 710fa36bfd CS-15474: fixed response name for the deleteTags API 2012-07-06 11:43:31 -07:00
Alena Prokharchyk ec26e836fc CS-15459: fixed listTags for userVms 2012-07-06 11:43:31 -07:00
Alena Prokharchyk 7acf8585b1 Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed
2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)

Conflicts:

	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
	api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
	api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
	api/src/com/cloud/api/commands/ListSnapshotsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	api/src/com/cloud/api/response/VolumeResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/vm/dao/UserVmDaoImpl.java
2012-07-06 11:43:31 -07:00
Sheng Yang 7349842c42 CS-15116: Add missing scripts for XCP server
Thank for the help from Wilhem Putz(wp@typoheads.at) to identify the issue.
2012-07-06 11:34:36 -07:00
Brian Federle 093af8a6a9 CS-15388: Fix labels
Labels for CPU/Mem (as found in compute offering window) are missing
the required values for CPU and RAM

Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
2012-07-06 10:27:09 -07:00
Hugo Trippaers 54203f08ad Small stop-gap fix to include cloud-elb.jar and cloud-netapp.jar in the rpms 2012-07-06 10:06:46 -04:00
Hugo Trippaers 6cc8896f96 package statement was removed during a license update 2012-07-06 10:03:51 -04:00
Edison Su 57ab39937c add script to setup devcloud image 2012-07-05 20:36:43 -07:00
Alena Prokharchyk 81afcabdb2 Added missing package name mistakenly removed by headers cleanup checkin 2012-07-05 11:12:02 -07:00
David Nalley 471924ff11 adding a high level overview 2012-07-05 10:56:10 -04:00
David Nalley 27a23b2e2a committing some bugfixes to runbook - thanks to Watnuss for pointing them out on IRC 2012-07-05 10:38:55 -04:00
David Nalley a77b6756fc more cleanups of license headers and attribution 2012-07-04 21:48:07 -04:00
David Nalley 5c3a8cd490 more license header cleanups 2012-07-04 21:41:50 -04:00
David Nalley c0d5f86356 a bit more license header cleanup 2012-07-04 19:53:04 -04:00
David Nalley 53d5fe6636 fixing another license header 2012-07-04 19:47:12 -04:00
David Nalley 6fe595f3d3 committing some more changes to marvins license headers 2012-07-04 18:50:49 -04:00
David Nalley 54d7a10b99 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-04 18:45:34 -04:00
David Nalley ecf2cd57f9 fixing license headers in marvin 2012-07-04 18:45:08 -04:00
Edison Su 27e9cdbece add console proxy support for devcloud 2012-07-03 23:38:39 -07:00
Edison Su 1f8e99439c move to devcloud 2012-07-03 23:38:39 -07:00
Vijayendra Bhamidipati 023c2e4f59 Encrypting password values that are stored in the cluster_details table 2012-07-03 17:27:21 -07:00