etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,142 Commits 323 Branches 325 Tags 836 MiB
Commit Graph

812 Commits

Author SHA1 Message Date
Jessica Wang ce9048c172 CLOUDSTACK-4413: UI > infrastructure > Guest IP Range > Add IP Range dialog > add IPv6 CIDR field, IPv6 Gateway field. 2013-08-22 17:39:15 -07:00
Jessica Wang d1a3b15219 CLOUDSTACK-1365: Some property names in Baremetal API have been changed. Here is corresponding UI change. 2013-08-22 17:15:03 -07:00
Jessica Wang 2e56e7b02c CLOUDSTACK-4102: UI > Instracture > SystemVM / VirtualRouter > detailView > change service offering action - display different description based on VM's state. 2013-08-22 15:04:48 -07:00
Jessica Wang fd47059436 CLOUDSTACK-3950: UI > remove global variable havingS3, havingSwift who are no longer in use. 2013-08-20 16:04:40 -07:00
Jessica Wang 84228c2c60 CLOUDSTACK-3950: UI > set g_regionsecondaryenabled to true after adding region-wide secondary storage. 2013-08-20 15:35:56 -07:00
Jessica Wang b85d48495b CLOUDSTACK-4102: UI > instances page, routers page, systemVM page > change service offering dialog > change description to "Please read the dynamic scaling section in the admin guide before scaling up". 2013-08-20 10:57:37 -07:00
Jessica Wang 3ed3c53f7f CLOUDSTACK-4355: UI > Infrastructure > clusters > add cluster dialog > show Public Traffic vSwitch Type/Name when Override Public Traffic is checked; show Guest Traffic vSwitch Type/Name when Override Guest Traffic is checked. 2013-08-16 10:44:00 -07:00
Jessica Wang da61776111 CLOUDSTACK-4142: UI > Infrastructure > zone > physical network > guest > edit guest network > network offering dropdown > get info of current network offering from listNetworks API response instead of listNetworkOfferings API response. 2013-08-14 13:41:23 -07:00
Jessica Wang 3c77bf8456 CLOUDSTACK-4127: UI > Infrastructure > clusters > create cluster dialog > not pass value in vSwitchPublicType, vSwitchPublicName, vSwitchGuestType, vSwitchGuestName to addCluster API call since the 4 fields are hidden. 2013-08-13 13:55:24 -07:00
Jessica Wang f6671f6093 CLOUDSTACK-4266: UI > Infrastructure > clusters > create cluster dialog > make Nexus 1000v fields optional. 2013-08-13 13:25:53 -07:00
Brian Federle d5b9f2402c Fix missing dataProvider for secondary storage list 2013-08-13 10:58:40 -07:00
Jessica Wang b040bf224b CLOUDSTACK-4189: UI > Infrastructure > zone > dedicatedZone object is different from zone object. Fix a bug that they were wrongly presumed to be the same object and wrongly mixed which caused zone object's properties being wrongly overriden. 2013-08-09 18:50:17 -07:00
Jessica Wang 24ef5ba9f7 CLOUDSTACK-4134: UI > Infrastructure > zone > physical network > guest > edit action - pass vlan parameter to updatePhysicalNetwork API no matter vlan field is blank or not. 2013-08-09 17:26:53 -07:00
Jessica Wang b50e485541 CLOUDSTACK-4223: UI > Infrastructure > zone > USC > blades tab - fix a bug that blades failed to be listed in listView. 2013-08-09 16:21:41 -07:00
Jessica Wang 592cd75867 CLOUDSTACK-4102: UI > change label of scaleUp/changeServiceOffering action from "Scale Up" to "Change Service Offering" for both running VM and stopped VM. 2013-08-09 15:12:28 -07:00
Jessica Wang ea717c18ce CLOUDSTACK-4218: UI > Infrastructure > zone > UCS > UCS manager details tab - fix a bug that passed wrong id to listUcsManagers API. 2013-08-09 14:53:30 -07:00
Jessica Wang 9807f86619 CLOUDSTACK-4102: UI > Intances menu > when user VM is running, hide scaleUp action if hypervisor is KVM. 2013-08-08 10:35:56 -07:00
Jessica Wang c6368b8a2c CLOUDSTACK-4102: UI > User VM, System VM > remove "Change Service Offering" action since it has been replaced with new action "Scale Up VM". 2013-08-07 16:04:56 -07:00
Jessica Wang 30c7329002 CLOUDSTACK-4160: listUcsManagers API has been extended to take in id parameter. Here is related UI change. 2013-08-07 14:51:36 -07:00
Jessica Wang 7d5e4c666b CLOUDSTACK-4177: UI > Infrastructure > zone > UCS > blades > disable Associate Profile to Blade button for a blade that already has a profle associated. 2013-08-07 14:39:01 -07:00
Jessica Wang 893619dece CLOUDSTACK-4093: UI > Infrastructure > zone > UCS Manager - (1) add details tab (2) add Delete UCS Manager action. 2013-08-07 14:20:11 -07:00
Thomas O'Dowd a764cb91b3 CLOUDSTACK-3211: Add help docs to S3 secondary storage configuration. 
When adding an S3 secondary storage, the administrator will
now be shown help for each input field making it friendlier
to use.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 74643c9561b1ea564f180c3780ef762e97e7c10b)
 2013-08-06 13:22:59 +05:30
Jessica Wang 12d6249502 CLOUDSTACK-4051: UI > Infrastructure > zone > UCS > Add UCS Manager dialog > not show password in plain text. 2013-08-05 15:31:59 -07:00
Jessica Wang 9863287730 CLOUDSTACK-3753: UI > Infrastructure > zone > physical network > Guest > remove Add VLAN Range action since VLAN Range(s) is editable through Edit action. 2013-08-01 16:44:30 -07:00
Jessica Wang 3587127df6 CLOUDSTACK-3753: UI > Infrastructure > zone > physical network > Guest > Edit action - make VLAN Range(s) editable. This is corresponding UI change to recent change of updatePhysicalNetwork API. 2013-08-01 15:57:23 -07:00
Jessica Wang 4f51d21908 CLOUDSTACK-3753: UI > Infrastructure > zone detail > physical network > guest > (1) remove Delete VLAN Range action. (2) change Add VLAN Range action to pass new VLAN range + exisitng VLAN range(s) to API. This is corresponding UI change to updatePhysicalNetwork API change that removevlan property has been removed and definition of vlan property has been changed. 2013-08-01 15:43:41 -07:00
Jessica Wang 11c2265d1e CLOUDSTACK-3713: UI > Infrastructure menu > System VMs > Scale Up action: call scaleSystemVm API instead of scaleVirtualMachine API. 2013-08-01 13:43:05 -07:00
Jessica Wang 405f73267e CLOUDSTACK-2990: UI > scale up VM dialog - add description 'For VMware-based Linux VMs, please read the dynamic scaling section in the admin guide before scaling.' 2013-07-30 10:57:07 -07:00
Isaac Chiang 452176c0b4 CLOUDSTACK-3935:Inconsistent json object name for image store api 2013-07-30 19:20:56 +08:00
Jessica Wang db82d5605d CLOUDSTACK-3820: UI > Infrastructure menu > zone detail > UCS > associate profile to blade action - poll async job result until async job is finished. 2013-07-26 16:15:22 -07:00
Jessica Wang 8280bf14e6 CLOUDSTACK-3813: UI > change label from Cache Storage to Secondary Staging Store. 2013-07-26 15:29:18 -07:00
Jessica Wang a5194a6304 CLOUDSTACK-3818: listSecondaryStagingStore API has been renamed. Here is related UI change. 2013-07-26 15:16:52 -07:00
Jessica Wang 81b121bbe0 CLOUDSTACK-3818: Cache Storage API commands have been renamed. Here is related UI change. 2013-07-26 14:46:08 -07:00
Jessica Wang 33aab256fc CLOUDSTACK-3820: UI > Infrastructrue menu > zone detail > UCS > update API response examples since API response has been changed. 2013-07-26 14:28:06 -07:00
Jessica Wang 037c6958b8 CLOUDSTACK-3651: errortext in listVmwareDcs API response has been changed. Change UI to override error handling of listVmwareDcs API regardless of the content of errortext in API response. 2013-07-26 13:06:42 -07:00
Jessica Wang 482c425193 CLOUDSTACK-3820: UI > Infrastructure menu > zone detail > UCS > API command names have been changed. Here is related UI change. 2013-07-26 12:58:18 -07:00
Brian Federle bba79b6b4e CLOUDSTACK-3710: Remove remaining overcommit fields from cluster UI 2013-07-26 12:02:49 -07:00
Jessica Wang adc72812fe CLOUDSTACK-3709: UI > Infrastructure menu > Secondary Storage > Cache Storage > detailView > implement Delete action. 2013-07-26 11:24:15 -07:00
Jessica Wang 65f5642bea CLOUDSTACK-3820: UI > Infrastructure menu > zone detail > UCS > blade - remove blade detailView since it's not used. 2013-07-25 16:42:22 -07:00
Jessica Wang e8d10e73ef CLOUDSTACK-3820: UI > Infrastructure menu > zone detail > UCS > associatesUcsProfileToBlade API has been changed from sync to async. Here is related UI change. 2013-07-25 16:30:16 -07:00
Brian Federle ddbe5338d7 CLOUDSTACK-3739: Add text label to 'add VMware DC' action for clarity 2013-07-24 14:48:49 -07:00
Jessica Wang 11dce48855 CLOUDSTACK-3789: UI - specify type when making API calls. 2013-07-24 11:50:49 -07:00
Jessica Wang c02e802170 CLOUDSTACK-2760: UI > Infrastructure menu > System VMs > fix a bug that Agent State was not mapped correctly between systemVMs and hosts. 2013-07-23 11:34:22 -07:00
Brian Federle c9fdee8f21 CLOUDSTACK-3710: Remove over-commit ratio fields from edit cluster UI 
Removes over-commit fields as editable. This also removes the 'edit
cluster' action, as there are no longer any fields to edit.
 2013-07-22 16:20:04 -07:00
Jessica Wang f1e242f531 CLOUDSTACK-3427: UI > UCS manager > implement listUcsManager API since it has been fixed at server-side. 2013-07-22 13:43:37 -07:00
Isaac Chiang 39a730ccd1 CLOUDSTACK-3388:No error message shows when a dedicate operation failed during the creation of a pod/cluster 2013-07-22 15:33:48 +08:00
Jessica Wang 0cdda2988f CLOUDSTACK-3651: Infrastructure menu - zone detail - listVmwareDcs API only exists in non-oss build, suppress error "The given command does not exist or it is not avaiable for user" from UI for this specific case. 2013-07-19 15:22:37 -07:00
Ian Duffy ad69bc8da3 Format JS 2013-07-18 12:34:20 -04:00
Jessica Wang be0dedefa8 CLOUDSTACK-3563: UI > Network menu > Guest Netework section > provide "Add Guest Network" option where root-admin can create shared networks from. 2013-07-16 13:38:28 -07:00
Jessica Wang e93ef73e9f CLOUDSTACK-3427: UI > UCS manager > implement associatesUcsProfileToBlade API. 2013-07-11 17:19:21 -07:00
Jessica Wang 20bade62f1 CLOUDSTACK-3460: UI > Infrastructure menu > clusters > add cluster dialog > when hypervisor is VMware, call listVmwareDcs API to get vCenter Host and vCenter Datacenter value if the 2 fields are not filled (the 2 fields are optional). 2013-07-11 15:41:51 -07:00
Brian Federle 6eeea70dad CLOUDSTACK-3461: Make vCenter user/password fields optional 2013-07-11 11:14:06 -07:00
Jessica Wang 8d7a2162e4 CLOUDSTACK-3450: UI > Infrastructure menu - zone detail - (1) Add VMware datacenter fields. (2) Show Remove VMware datacenter action where there is no VMware datacenter attached with the zone. Show Add VMware datacenter action otherwise. 2013-07-11 11:11:18 -07:00
Mice Xia 742bc8dc83 fix CLOUDSTACK-1852, use findHostsForMigration to list available hosts for migration 2013-07-11 11:01:07 +08:00
Jessica Wang 7b783f0df4 CLOUDSTACK-3427: UI > UCS manager > implement listUcsBlade API. 2013-07-09 16:08:19 -07:00
Jessica Wang e30ce5c9e8 CLOUDSTACK-3427: UI > UCS manager > implement listUcsProfile API. 2013-07-09 14:59:29 -07:00
Jessica Wang bc8f32363e CLOUDSTACK-3427: UI > UCS manager > implement addUcsManager API. 2013-07-09 14:30:34 -07:00
Brian Federle 70c4a97eaa UI: Add initial UCS section to infrastructure page 2013-07-09 13:48:48 -07:00
Pranav Saxena 836215c7f2 pod/host dedication failure cases 2013-07-08 14:49:47 +05:30
Isaac Chiang 0d7d345339 CLOUDSTACK-3230: UI add cluster remains in processing state 2013-07-05 18:21:34 +08:00
Isaac Chiang d1adefe284 CLOUDSTACK-3081: Even a dedicate pod operation fails, the system shows "Task Complete" 
Dedicate zone/pod/cluster/host operations have been fixed
 2013-07-05 15:41:09 +08:00
Pranav Saxena 5396dfa55c CLOUDSTACK-2760: Agent status for SSVM and CPVM 2013-07-03 17:22:35 +05:30
Jessica Wang f9de646c28 CLOUDSTACK-3093: UI - Infrastructure menu - zone detail - physical network - network service providers - Internal LB VM - add migrate, view console action. 2013-07-02 14:59:14 -07:00
Pranav Saxena 2da3be7e3f routerVM scale up response 2013-07-02 15:29:42 +05:30
Pranav Saxena cfd1098951 system VM Scale up response handling 2013-07-02 15:14:24 +05:30
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes 
SolidFire plug-in

SolidFire plug-in related
 2013-06-28 16:59:21 -06:00
Pranav Saxena 49ab93cd23 Dedication of pod/cluster 2013-06-25 18:19:45 +05:30
Pranav Saxena 388e80efb1 making fields required when adding a vmwareDC to a cloudstack zone 2013-06-25 01:12:42 +05:30
Jessica Wang 8837113abc CLOUDSTACK-3123: UI > Infrastructure menu > Secondary Storage > Secondary Storage detailView > delete action > fix a JS error "args.context.secondarystorages is undefined" when delete action is clicked. 2013-06-21 15:17:58 -07:00
Jessica Wang 7794e9282b CLOUDSTACK-3123: UI > Infrastructure menu > Secondary Storage > Cache Storage > detailView: remove Delete action since there is not API for it. 2013-06-21 15:14:33 -07:00
Jessica Wang cb84e8404d CLOUDSTACK-3123: UI > Infrastructure menu > Secondary Storage > Cache Storage: implement detailView. 2013-06-21 15:09:26 -07:00
Jessica Wang 364f26327e CLOUDSTACK-3123: UI - remove obsolete dataProvider. 2013-06-21 14:13:48 -07:00
Jessica Wang 08a7b28245 CLOUDSTACK-3123: UI > Infrastructure menu > Secondary Storage > Cache Storage: implement Add NFS Cache Storage action. 2013-06-21 14:04:16 -07:00
Jessica Wang 73c1a56c2a CLOUDSTACK-3123: Infrastructure menu > Secondary Storage > split it into 2 sections: Secondary Storage, Cache Storage. 2013-06-21 11:54:07 -07:00
Brian Federle 1b62cc1f2d Dedicate host UI: Fix broken jobid response 
Conflicts:
	ui/scripts/system.js
 2013-06-20 15:36:08 -07:00
Brian Federle 60622d7a28 CLOUDSTACK-3045: Fix missing 'array2' from add cluster/add host 2013-06-20 15:29:32 -07:00
Jessica Wang 9ed52fd77d CLOUDSTACK-2651: UI - Infrastructure menu > zone > physical network > guest > IP Range > Add IP Range dialog: add gateway field, netmask field. 2013-06-20 14:56:54 -07:00
Brian Federle 5b5d3d0be2 Zone chart: Update secondary storage link to show both sub-sections 
-Show both 'secondary storage' and 'image stores' via dropdown on link
 to list view
 2013-06-20 14:40:00 -07:00
Edison Su 5f28dcc6bb merge to master 2013-06-19 22:41:13 -07:00
Isaac Chiang 791eb601b7 CLOUDSTACK-3069: [UI]Quickview of POD is not displaying any info in UI 2013-06-20 10:33:21 +08:00
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Brian Federle 0dd14b1c61 Secondary storage listView: Add image stores dummy section 2013-06-19 12:24:36 -07:00
Wei Zhou 5e5bb2cae7 remove duplicate lines of 2d678063fa 2013-06-19 15:46:51 +02:00
Wei Zhou 2d678063fa Shared networks is only supported in Basic zone and Advanced zone with SG in Infracstructure->Zone->Physical Network->Guest->Network 2013-06-19 15:37:39 +02:00
Jessica Wang a16af4380b CLOUDSTACK-2770: UI - Infrastructure menu - physical netework - network service providers - Baremetal PXE - Add Baremetal PXE Device dialog - add Tftp Root Diectory field. 2013-06-18 15:57:11 -07:00
Jessica Wang 236dc12d8a CLOUDSTACK-2770: UI - Infrastructure menu - physical netework - network service providers - add Baremetal DHCP, Baremetal PXE. 2013-06-18 15:56:21 -07:00
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Jessica Wang 2630625260 CLOUDSTACK-2360: UI - Infrastructure menu - zone detail - physical network - network service providers - Netscaler - view devices - device detail page - add GSLB Provider enabled or not, GSLB Provider Public IP, GSLB Provider Private IP field. 2013-06-13 15:03:04 -07:00
Jessica Wang 643b3b5066 CLOUDSTACK-2870: UI - Infrastructure menu - add guest network dialog - change label for isolatedvlanid property. 2013-06-13 13:56:22 -07:00
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit 
c30d9be3ce) into object_store.
 2013-06-12 11:20:32 -07:00
Brian Federle ce17f856ea CLOUDSTACK-2811: Default add primary storage dialog to scope=cluster 2013-06-07 11:05:01 -07:00
Jessica Wang 36ed93f8ab CLOUDSTACK-2880: UI - zone detail - add VMware DC action - replace URL field with vcenter field and make vcenter required. 2013-06-06 11:39:05 -07:00
Pranav Saxena d98289baca making detail view vlan range uneditable 2013-06-06 17:21:47 +05:30
Pranav Saxena c0850d4d82 CLOUDSTACK-2873: Passing account name for explicit dedication 2013-06-06 17:14:57 +05:30
Jessica Wang 7e8d19963d CLOUDSTACK-2842: UI - fix a JS error "elems is undefined" when popping up a dialog box that has zone dropdown and there is no zone created yet. 2013-06-04 14:22:47 -07:00
Pranav Saxena ee3043b884 Changing drop box to textfield 2013-06-04 17:50:15 +05:30
Pranav Saxena cc2091078d Legacy zone validation changes 2013-06-04 10:30:25 +05:30
Jessica Wang 84634d4cf6 CLOUDSTACK-2782: UI - Infrastructure menu - zone detail page - rename action name to be more clear. 2013-06-03 16:45:49 -07:00
Jessica Wang 5a525211de CLOUDSTACK-2782: UI - Infrastructure menu - zone detail page - implement Remove VMWare DC action. 2013-06-03 16:37:38 -07:00
Jessica Wang bfe05acd95 CLOUDSTACK-2782: UI - Infrastructure menu - zone detail page - add new action Add VMWare DC. 2013-06-03 16:28:09 -07:00
Pranav Saxena 2aae10bb64 CLOUDSTACK-2029:Zone wide primary storage for VMware 2013-06-03 17:04:39 +05:30
Pranav Saxena 45681c57f6 CLOUDSTACK-2029:Zone wide primary storage for VMware 2013-06-03 17:03:07 +05:30
Pranav Saxena c42da47aa6 formatting the code for better readability 2013-05-30 21:57:17 +05:30
Pranav Saxena 8c79aa8cc1 Explicit Dedication - Zone action item dedication/release API integration 2013-05-30 21:57:15 +05:30
Pranav Saxena 1545b3f3ed host and cluster action item API integration calls 2013-05-30 21:57:15 +05:30
Pranav Saxena e03e2aab06 explicit Dedication - Cluster API integration action item for dedication/release 2013-05-30 21:57:15 +05:30
Pranav Saxena 2489d858f9 explicit Dedication - Pod action filter for release/dedicate action items 2013-05-30 21:57:14 +05:30
Pranav Saxena cee82eca55 explicit Dedication - Pod action filter for releasing dedicated pod (API Call) 2013-05-30 21:57:14 +05:30
Pranav Saxena 1c9a34abcc explicit Dedication - Pod action filter for release/dedicate action items 2013-05-30 21:57:14 +05:30
Pranav Saxena fd72c12967 explicit dedication - dedicatePod API call action item integration 2013-05-30 21:57:13 +05:30
Pranav Saxena 55d3176332 explicit dedication - POD UI-API detail view integration 2013-05-30 21:57:13 +05:30
Pranav Saxena e95ddb6562 Explicit Dedication - Cluster detail View UI-API Integration code 2013-05-30 21:57:13 +05:30
Pranav Saxena 6aa2268efb Explicit Dedication - Host UI-API Integration code 2013-05-30 21:57:12 +05:30
Pranav Saxena 9f76c0559c Explicit Dedication - Cluster UI-API Integration code 2013-05-30 21:57:12 +05:30
Pranav Saxena a52b3139c5 Pod explicit dedication Detail View 2013-05-30 21:57:12 +05:30
Pranav Saxena 1553ec6580 explicit dedication API-UI integration 2013-05-30 21:57:11 +05:30
Pranav Saxena c5493f0778 Explicit Dedication - Cluster UI/API Integration code 2013-05-30 21:57:10 +05:30
Pranav Saxena 60ff005939 Explicit Dedication - Host UI/API Integration code 2013-05-30 21:57:10 +05:30
Pranav Saxena 97cb514f05 Pod dedication action button functionality 2013-05-30 21:57:10 +05:30
Pranav Saxena aab0bb4d31 Dedicate POD -UI and API integration code 2013-05-30 21:57:09 +05:30
Pranav Saxena 25643459af Dedicate POD -UI and API integration code 2013-05-30 21:57:09 +05:30
Pranav Saxena 4d5033f263 Cluster/Pod/Host Explicit Dedication front end UI 2013-05-30 21:57:09 +05:30
Jessica Wang 7ee71dfd87 CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - Dedicated Guest VLAN Range tab - Dedicate VLAN Range dialog - change VLAN Range field from textbox to dropdown that lists all existing Guest VLAN Ranges under the physical network. 2013-05-28 11:51:46 -07:00
Jessica Wang d99fae07c7 CLOUDSTACK-747: Infrastructure menu - service providers - change display name of internalLbVm to be Internal LB VM. 2013-05-24 16:36:45 -07:00
Jessica Wang 7cc1e82210 CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - Release Dedicated VLAN Range action - change label and message. 2013-05-24 16:17:39 -07:00
Jessica Wang 11a7e46dfb CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - Dedicated Guest VLAN Range tab - implement Release Dedicated VLAN Range action. 2013-05-24 15:45:10 -07:00
Jessica Wang b247ba6b4f CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - devailView - (1) add new tab "Dedicated VLAN Ranges" that list dedicated Guest VLAN Ranges under the physical network. (2) implement "Dedicate Guest VLAN Range" action. 2013-05-24 15:24:00 -07:00
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Jessica Wang 57049d5aef CLOUDSTACK-2538: object_store - UI - Infrastrcuture menu - secondary storages page - add secondary storage step - add name field. 2013-05-23 17:08:37 -07:00
Jessica Wang c7b902024c CLOUDSTACK-747: internalLb in VPC - Infrastructure menu - network service provider - add InternalLbVm. Clicking it will lead to a screen that can enable/disable provider and have instances tab that can start/stop LB Instance. 2013-05-22 10:49:26 -07:00
Murali Reddy 53499c0858 changing default 'GSLB provider' check box value to unchecked in UI 2013-05-22 16:26:46 +05:30
Edison Su f7c1b711ad merge to master 2013-05-16 23:56:20 -07:00
Jessica Wang cd318661d2 CLOUDSTACK-2505: object_store - UI - infrastructure menu - secondary storages - add URL, Provider, Scope, Details to detailView. 2013-05-16 13:54:32 -07:00
Jessica Wang 47aeda9893 CLOUDSTACK-2505: object_store - UI - infrastructure menu - add secondary storage- Swift - not pass details[i] info when corresponding field is empty. 2013-05-16 13:13:29 -07:00
Jessica Wang d5ab59614a CLOUDSTACK-2505: object_store - UI - infrastructure menu - add secondary storage- S3 - not pass details[i] info when corresponding field is empty. 2013-05-16 13:05:36 -07:00
Sheng Yang 2d2c0c48cd Merge branch 'pvlan' 
Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
 2013-05-15 16:08:08 -07:00
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Jessica Wang b082e23af3 CLOUDSTACK-2351: object store - UI - restore UI change that was overwriten by the sync from master branch. 2013-05-13 16:22:20 -07:00
Jessica Wang b1f6d89141 CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - network service providers - populate provider detailView. 2013-05-09 15:31:25 -07:00
Jessica Wang 04be0cdec2 CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - network service providers - show Cisco VNMC in Advanced zone, hide it in Basic zone. 2013-05-09 14:33:18 -07:00
Brian Federle c1e9e4de61 Merge branch 'master' into ui-cisco-asa1000v-support 2013-05-08 10:47:54 -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 25e992dc8e CLOUDSTACK-2348: PVLAN - UI - Infrastructure menu - guest network - add broadcast URI field to listView and detailView. 2013-05-07 13:04:04 -07:00
Jessica Wang 87b7a84507 CLOUDSTACK-2348: PVLAN - UI - infrastructure menu - create guest network - add new field Private VLAN ID. 2013-05-06 12:14:19 -07:00
Brian Federle 2cd70d06b3 Merge branch 'master' into ui-cisco-asa1000v-support 2013-05-06 10:40:08 -07:00
Pranav Saxena e6ae66d596 scaleUp VM response change corresponding UI changes 2013-05-06 14:08:40 +05:30
Pranav Saxena 5811ae7e25 CLOUDSTACK-2274:Detail view loading problem when deleting a zone 2013-05-05 01:15:14 +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