etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,319 Commits 330 Branches 325 Tags 898 MiB
Commit Graph

23319 Commits

Author SHA1 Message Date
Min Chen efb4471dc9 CLOUDSTACK-2196 and CLOUDSTACK-2126: fix missing async job status in 
listXXX api and incorrect async job status in other async api.

Conflicts:
	server/src/com/cloud/api/query/vo/AccountJoinVO.java
 2013-04-25 17:40:18 -07:00
Min Chen de27f0ff53 Clean up DownloadMonitor and TemplateManagerImpl. 2013-04-25 16:49:46 -07:00
Jessica Wang 64635abba5 CLOUDSTACK-1910: UI- Regions menu - GSLB - View assigned load balancing - refresh data. 2013-04-25 16:03:02 -07:00
Jessica Wang 6f60833f93 CLOUDSTACK-2120: mixed zone management - (1) extend listRouters API to to take in zonetype. (2) UI: populate Routers list page with ones whose networktype matches selected option in zone type dropdown on top menu. (3) UI: count total number of Routers based on selected option in zone type dropdown on top menu. 2013-04-25 15:10:33 -07:00
Prachi Damle 232d44bf6e CLOUDSTACK-2158: 'userconcentratedpod_firstfit failed to find alternate host to run VM 
In the applicationContext .xml , the context of the 'UserConcentratedPodPlanner' needs to include the list of allocators.
This will ensure that when this component is loaded by Spring, the allocators gets initialized.
 2013-04-25 14:48:34 -07:00
Jessica Wang f883b0f904 CLOUDSTACK-2120: mixed zone management - UI: count total number of Primary Storages, Secondary Storages based on selected option in zone type dropdown on top menu. 2013-04-25 14:25:34 -07:00
Brian Federle 880f98c023 Update affinity icon 2013-04-25 13:21:15 -07:00
Brian Federle 9544d04fce Update affinity icon 2013-04-25 13:20:52 -07:00
Brian Federle e6d9e81213 Better styling for multi-detail panels 2013-04-25 12:23:39 -07:00
Brian Federle eab667f266 Merge branch 'master' into ui-add-remove-nics 2013-04-25 11:25:52 -07:00
Brian Federle 6802b9dac6 Add icon for affinity groups section 2013-04-25 11:23:31 -07:00
Jessica Wang e8b6c7b33d CLOUDSTACK-2120: mixed zone management - UI: count total number of hosts based on selected option in zone type dropdown on top menu. 2013-04-25 11:14:20 -07:00
Brian Federle 18a337270d Merge branch 'master' into ui-add-remove-nics 2013-04-25 11:09:51 -07:00
Brian Federle 5ce289034d Merge branch 'ui-vm-affinity' 2013-04-25 11:04:35 -07:00
Jessica Wang b5979ba9b5 LOUDSTACK-2120: mixed zone management - (1) extend listZones API to to take in networktype. (2) UI: populate Zones list page with ones whose networktype matches selected option in zone type dropdown on top menu. (3) UI: count total number of zones based on selected option in zone type dropdown on top menu. 2013-04-25 10:40:08 -07:00
Jessica Wang ee02311fae CLOUDSTACK-2120: mixed zone management - (1) extend listHosts API to to take in zonetype. (2) UI: populate Hosts/SecondaryStorages list page with ones whose zonetype matches selected option in zone type dropdown on top menu. 2013-04-25 09:51:57 -07:00
Nicolas Lamirault 099677a124 CLOUDSTACK-2172: adding database upgrade to 4.1.0 in PremiumDatabaseUpgradeChecker 
Add migration to 4.1.0 in the PremiumDatabaseUpgradeChecker, like in the
DatabaseUpgradeChecker.

I opened the ticket CS 2172, and this fix corrects the issue.
Regards.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-04-25 15:20:26 +01:00
Pranav Saxena 6bc0b70f38 CLOUDSTACK-2186:migrateVolume API gets undefined storageid 2013-04-25 19:40:44 +05:30
Nitin Mehta d1642a489c =initial changes 2013-04-25 18:29:57 +05:30
Milamber cfc0633ec7 Fix a issue with the russian Web UI (one key with a '\n' as value) 2013-04-25 12:27:21 +00:00
Milamber 0e2ffe72aa add lang key for Catalan, German, Italian, Norwegian. (from 4.1 branch) 2013-04-25 10:01:29 +00:00
Jayapal d5c3f87903 CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-25 15:16:26 +05:30
Jayapal 1f97b528c5 CLOUDSTACK-1573 listNics response update for not showing vlan to normal user 2013-04-25 14:48:41 +05:30
Milamber 08f6a24d19 Update the chinese (zh_CN) resource file for Web UI. 100% translate. Thanks to Gavin Lee. 2013-04-25 08:42:28 +00:00
Pranav Saxena 76e40ba5ad Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-04-25 12:34:10 +05:30
Pranav Saxena c8bfbfda31 CLOUDSTACK-1903:Delete event/alerts date parameter handling 2013-04-25 12:33:24 +05:30
Mice Xia 0c1d2680a5 remove a debug log in vmwareResource 2013-04-25 14:25:03 +08:00
Mice Xia 79cc241c64 fix CLOUDSTACK-2157 On VMWare ESXi host deployment: Expunged VMs are not getting cleaned up from the host 2013-04-25 14:25:03 +08:00
Radhika PC 96837eda0f CLOUDSTACK-1567 2013-04-25 11:18:00 +05:30
Marcus Sorensen 33006ff197 Summary: Don't add secondary storage to KVM heartbeat 
BUG-ID: CLOUDSTACK-2173
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1366865750 -0600
 2013-04-24 22:55:50 -06:00
Edison Su 4029e7af44 refactor data motion service for volumes 2013-04-24 18:53:57 -07:00
Edison Su 299cccf779 fix copy/paste bug 2013-04-24 18:32:06 -07:00
Milamber 1fed7df0ba CLOUDSTACK-2138: fix an issue on JA (japanese) resource file. Add ES (spanish) resource file 2013-04-25 00:53:28 +00:00
Milamber 9f5fc3833c Revert "CLOUDSTACK-2138: fix an issue on JA (japanese) resource file" 
This reverts commit 26029f0a26.
 2013-04-25 00:52:01 +00:00
Milamber 26029f0a26 CLOUDSTACK-2138: fix an issue on JA (japanese) resource file 2013-04-25 00:50:01 +00:00
Min Chen 79151f5f5d Remove sendToSSVM reference from SnapshotManagerImpl and 
TemplateManagerImpl.
 2013-04-24 17:45:32 -07:00
Min Chen 4c174a6867 Fix DeleteSnapshotBackupCommand to pass dataStore information. 2013-04-24 17:30:38 -07:00
Milamber 1d493acfcc CLOUDSTACK-2138 : add ca, de_DE, it_IT ja, koçKR,nb_NO pt_BR, ru_RU resource files for UI with ASCII with unicode encoding. (Merging for 4.1/Transifex, sync with transifex), add some languages in combo list on login page on UI 2013-04-25 00:22:46 +00:00
Milamber 2db2e7b3af CLOUDSTACK-2138 : add ca, de_DE, it_IT ja, koçKR,nb_NO pt_BR, ru_RU resource files for UI with ASCII with unicode encoding. (Merging for 4.1/Transifex, sync with transifex), add some languages in combo list on login page on UI 2013-04-25 00:18:21 +00:00
Brian Federle f1bdae006a Add icons for 'add account,' 'release from account' 2013-04-24 16:53:22 -07:00
Brian Federle 7cef521227 Add icon for 'change affinity' action 2013-04-24 16:46:17 -07:00
Jessica Wang 48b82a6f91 CLOUDSTACK-2120: mixed zone management - (1) extend listStoragePools API to to take in zonetype. (2) UI: populate Primary Storages list page with ones whose zonetype matches selected option in zone type dropdown on top menu. 2013-04-24 16:36:07 -07:00
Min Chen 5b76e4914c Remove sendToSecStorage methods from agentManager to use EndPoint 
instead.
 2013-04-24 16:21:41 -07:00
Brian Federle 25f2f0fcb7 Merge branch 'master' into ui-vm-affinity 
Conflicts:
	ui/scripts/instances.js
 2013-04-24 16:02:56 -07:00
Min Chen 0a976d5fd5 Change Upload table to store dataStoreId instead of hostId. 2013-04-24 15:20:09 -07:00
Min Chen f16f92dd1d Remove TemplateManager.getSecondaryStorageHost api. 2013-04-24 15:06:36 -07:00
Jessica Wang 8f5d8d5052 CLOUDSTACK-1910: cloudstack UI - Regions menu - GSLB - assigned load balancing - display assigned load balancing in listView and exclude assigned one from LB dropdown in Assign more load balancing dialog. 2013-04-24 14:57:47 -07:00
Edison Su 1c89bc78fd regression, need to modify iptables rules in rules.v4 2013-04-24 14:52:44 -07:00
Marcus Sorensen 7fa57922a4 Detail: Delete KVMHA dir contents if found when deleting templates, volumes 
from Nfs Secondary storage

BUG-ID: CLOUDSTACK-2173
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1366838425 -0600
 2013-04-24 15:20:25 -06:00
Min Chen 8d29cdf804 Remove SnapshotVO.getSecHostId and SnapshotVO.setSecHostId references 
from codebase to use SnapshotDataStoreVO.
 2013-04-24 11:54:42 -07:00