etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,698 Commits 342 Branches 328 Tags 925 MiB
Commit Graph

5016 Commits

Author SHA1 Message Date
Alena Prokharchyk 56d94fc074 Merge branch 'master' into internallb1 
Conflicts:
	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2013-05-09 10:21:34 -07:00
Milamber 2e1877af33 CLOUDSTACK-2413 - Display the Name of compute offering in dialog box Change Service Offering (was Description field before) 2013-05-09 10:50:04 +01:00
Alena Prokharchyk 1b8a6986a6 Merge branch 'master' into internallb1 
Conflicts:
	api/src/com/cloud/async/AsyncJob.java
	api/src/com/cloud/network/NetworkModel.java
	api/src/com/cloud/network/rules/LoadBalancerContainer.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
	client/tomcatconf/commands.properties.in
	engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkModelImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkModelImpl.java
	server/test/resources/appLoadBalancer.xml
	setup/db/db/schema-410to420.sql
	test/integration/component/test_multiple_ip_ranges.py
	test/integration/smoke/test_guest_vlan_range.py
	tools/marvin/marvin/integration/lib/base.py
 2013-05-08 13:29:43 -07:00
Pranav Saxena 305f3cb8a5 CLOUDSTACK-2387:Addition/Deletion of a VLAN Range from UI calls updateTrafficType API which makes all networklabels as undefined which finally results in failure to deploy VMs 2013-05-08 17:07:46 +05:30
Pranav Saxena 76e8afa24f CLOUDSTACK-2171:Unable to Create a VM In the VMware Setup with the latest Master 2013-05-08 17:05:36 +05:30
Jessica Wang 0a2d49301b Internal LB - UI - zone wizard - advanced zone - enable internal LB element, enable internal LB provider. 2013-05-07 15:53:03 -07:00
Brian Federle 5b74b4d6fe UI plugin API: Support IE-compatible CSS loading 
If browser is IE < 9, use document.createStyleSheet to properly load
plugin's CSS dynamically.
 2013-05-07 15:44:59 -07:00
Wei Zhou 944a7ea5d6 CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-05-07 13:15:30 -07:00
Pranav Saxena 33059d1f66 scaleUp VM response change corresponding UI changes 2013-05-07 13:13:55 -07:00
Pranav Saxena 92e18d8106 CLOUDSTACK-2337:Resize button available for root/domain admin and normal users 2013-05-07 13:13:55 -07:00
Pranav Saxena 12c79c8377 scale up virtual machine response change in the backend 2013-05-07 13:11:12 -07:00
Isaac Chiang c598bb0038 CLOUDSTACK-2076:Listview widget infinte scrolling error 2013-05-07 13:11:11 -07:00
Pranav Saxena d0615ea9a1 CLOUDSTACK-2274:Detail view loading problem when deleting a zone 2013-05-07 13:11:11 -07:00
Isaac Chiang 733b513c3a CLOUDSTACK-2160:Refresh button functionality for security groups and statistics tab 2013-05-07 13:11:11 -07:00
Wei Zhou af5bf94b43 CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-05-06 20:58:32 +01:00
Pranav Saxena e6ae66d596 scaleUp VM response change corresponding UI changes 2013-05-06 14:08:40 +05:30
Pranav Saxena 63fbdbb96f CLOUDSTACK-2337:Resize button available for root/domain admin and normal users 2013-05-06 13:45:32 +05:30
Pranav Saxena b33b316755 scale up virtual machine response change in the backend 2013-05-05 12:02:32 +05:30
Isaac Chiang a9f0fb8009 CLOUDSTACK-2076:Listview widget infinte scrolling error 2013-05-05 01:57:35 +05:30
Pranav Saxena 5811ae7e25 CLOUDSTACK-2274:Detail view loading problem when deleting a zone 2013-05-05 01:15:14 +05:30
Isaac Chiang 63f3ccd4df CLOUDSTACK-2160:Refresh button functionality for security groups and statistics tab 2013-05-04 13:41:02 +05:30
Pranav Saxena 3087bf7e5b CLOUDSTACK-2041:Granular global parameter- Storage Pool granular settings 2013-05-03 11:21:00 +05:30
Pranav Saxena 324b4f680c CLOUDSTACK-2041:Granular global parameter- Storage Pool granular settings 2013-05-03 11:16:15 +05:30
Mice Xia d7cab21e9a 1) rename RevertToSnapshotCmd->RevertToVMSnapshotCmd 2) add marvin test for vm snapshot 2013-05-03 12:32:53 +08:00
Pranav Saxena 1206fd6b4e Widget change to incorporate VM state while adding a load balancer rule 2013-05-02 22:25:47 +05:30
Pranav Saxena ba9feabe8c Widget change to incorporate VM state while adding a load balancer rule 2013-05-02 21:02:51 +05:30
Pranav Saxena 4933533893 CLOUDSTACK-2041:Granular global parameter- secondary storage settings not needed 2013-05-02 20:11:17 +05:30
Pranav Saxena 22a5c6d4b3 CLOUDSTACK-2041:Granular global parameter- Account settings 2013-05-02 20:06:20 +05:30
Pranav Saxena d91b0f2f6d CLOUDSTACK-2041:Granular global parameter- Cluster settings 2013-05-02 18:23:35 +05:30
Pranav Saxena 61f3f931dd CLOUDSTACK-2041:Granular global parameter- Zone settings 2013-05-02 17:37:01 +05:30
Pranav Saxena 6e2ecff4f5 Merge remote-tracking branch 'remotes/origin/ui-granular-settings' 2013-05-02 17:31:22 +05:30
Brian Federle c1de600cb4 Merge branch 'master' into ui-granular-settings 2013-05-01 14:45:05 -07:00
Jessica Wang 50a3c918c8 CLOUDSTACK-2120: mixed zone management - UI - instances.js - remove obsolete code that has been replaced with new change in global function createURL(). 2013-05-01 14:44:58 -07:00
Jessica Wang 4c7e0b308a CLOUDSTACK-2120: mixed zone management - UI - storage.js - remove obsolete code that has been replaced with new change in global function createURL(). 2013-05-01 14:41:39 -07:00
Jessica Wang 57167d2ca6 CLOUDSTACK-2120: mixed zone management - UI - templates.js - remove obsolete code that has been replaced with new change in global function createURL(). 2013-05-01 14:38:23 -07:00
Pranav Saxena fd2ae034f5 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-05-02 02:59:36 +05:30
Pranav Saxena 58648c4b53 CLOUDSTACK-2175: Add private Gateway can aonly be done by root or domain admin but not by normal user 2013-05-02 02:58:27 +05:30
Jessica Wang 60a8e881c1 CLOUDSTACK-2120: mixed zone management - UI - system.js - remove obsolete code that has been replaced with new change in global function createURL(). 2013-05-01 14:22:35 -07:00
Jessica Wang 996d2f5a2b CLOUDSTACK-2074: UI - affinity groups - VM wizard under Affinity Groups menu - step 5(select affinity group step) - make corresponding affinity group checked by default. 2013-05-01 14:07:23 -07:00
Pranav Saxena 38071e63d2 CLOUDSTACK-2113:Router VM scale up UI support 2013-05-02 02:33:27 +05:30
Brian Federle 47dd4828d2 VM wizard: fix select container overflow 2013-04-30 13:40:52 -07:00
Brian Federle 1a4a319d32 VM wizard: Show message if no affinity groups are available. 2013-04-30 13:30:40 -07:00
Brian Federle eacbb4cb2d Merge branch 'master' into ui-add-remove-nics 
Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/dictionary.jsp
 2013-04-30 11:57:38 -07:00
Sebastien Goasguen 77ae066c65 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-04-29 06:56:51 -04:00
Sebastien Goasguen 134704bb10 [TRANSLATION] Adding arabic strings 2013-04-29 06:56:46 -04:00
Pranav Saxena 6bf67c9f68 CLOUDSTACK-2113:System VM scaleUp UI support 2013-04-29 16:21:49 +05:30
Milamber 2ec28ce19c Sort in alphabetical order (to avoid duplicate key) and better compare with l10n ressource files (already in alphabetical order) 
Remove duplicate keys:
label.add.system.service.offering
label.dead.peer.detection
label.ESP.lifetime
label.IKE.lifetime
label.no.thanks
label.remove.project.account
label.tier
message.add.guest.network
message.enable.vpn
message.installWizard.copy.whatIsACluster
label.no.thanks
label.remove.project.account
message.enable.vpn

Remove bad keys name:
label.local.storage.enabled=Local Storage Enabled
label.totoal.of.ip

Signed-off-by: Milamber <milamber@apache.org>
 2013-04-27 19:05:37 +00:00
Brian Federle 6b1da42221 Detail view, multi-group actions: Prevent refresh of all tabs 
Prevent call to updateTabContent, which will switch the detail view
off the current tab on action complete.
 2013-04-26 15:32:15 -07:00
Brian Federle 86a9f27692 Detail view/instances section: Fix context, add makeDefault action 
-Add 'makeDefault' action to set default NIC

-Fix context passing for multi-actions, which wasn't passing the correct
 nic object previously.
 2013-04-26 15:21:57 -07:00
Brian Federle ab245f5b19 Detail view: fix multi-action styling 2013-04-26 15:15:15 -07:00