4ebe0469ea
remove a \n char
2013-04-29 12:06:25 +01:00
77ae066c65
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
2013-04-29 06:56:51 -04:00
134704bb10
[TRANSLATION] Adding arabic strings
2013-04-29 06:56:46 -04:00
d3c82b31b6
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
2013-04-29 16:22:37 +05:30
6bf67c9f68
CLOUDSTACK-2113:System VM scaleUp UI support
2013-04-29 16:21:49 +05:30
0f2a249411
CLOUDSTACK-2138 - add requirements in README to use sync-transifex-ui.sh script
2013-04-29 11:47:45 +01:00
b633353fff
CLOUDSTACK-2138 - first automate sync with Transifex. 1/ Upload the lastest EN resource file on Transifex. 2/ Download the lastest L10N resource file for "ca de_DE es fr_FR it_IT ja ko_KR nb_NO pt_BR ru_RU zh_CN" form Transifex to CS repo.
2013-04-29 11:14:57 +01:00
509cfa9856
CLOUDSTACK-2138 - add a sync-transifex-ui.sh script to automate the exchange between CloudStack L10N resource files and Transifex CS-UI resource files
...
Signed-off-by: Milamber <milamber@apache.org>
2013-04-29 11:02:26 +01:00
766b36f57c
Add VPN users automation tests
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-29 14:15:28 +05:30
deaf9106ca
CLOUDSTACK-741: Granular Global Parameters and adding fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200
...
Adding the zone, cluster, account level parameters
The parameters at scope (zone/cluster/pool/account) can be updated by updateConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
Whenever these scoped parameters are used in CS they get value from the corresponding details table if not defined get value from global parameter.
Same with the listConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
2013-04-29 14:11:51 +05:30
b2fdd5e2a2
CLOUDSTACK-702: Tests for Multiple IP Ranges
...
1. Adding a cidr in existing subnet
2. Adding a cidr in new subnet
Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-29 11:24:40 +05:30
ef00f1b04f
CLOUDSTACK-2120: mixed zone management - API: extend listClusters API to to take in zonetype.
2013-04-27 21:38:03 -07:00
271f8759be
CLOUDSTACK-2120: mixed zone management - API: extend listPods API to to take in zonetype.
2013-04-27 18:30:21 -07:00
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
774b2ebf9d
CLOUDSTACK-2120: mixed zone management - API: extend listSystemVMs API to to take in zonetype.
2013-04-27 11:41:53 -07:00
45dbd9cdc6
CLOUDSTACK-2120: mixed zone management - API: extend listTemplates, listIsos API to to take in zonetype.
2013-04-27 11:02:02 -07:00
1f0863f75b
CLOUDSTACK-2120: mixed zone management - API: extend listNetworks API to to take in zonetype.
2013-04-26 15:23:30 -07:00
a20ed3a43d
CLOUDSTACK-2120: mixed zone management - API: change listZones API to to take in zonetype instead of networktype (to be consistent with other listXXXXXXXs API).
2013-04-26 11:37:32 -07:00
3e2eb59723
CLOUDSTACK-2120: mixed zone management - UI: make global function changeURL() to pass zonetype to API calls based on selected option in zone type dropdown on top menu.
2013-04-26 11:26:21 -07:00
7cf312a770
CLOUDSTACK-2120: mixed zone management - API: extend listSnapshots API to to take in zonetype.
2013-04-26 11:19:35 -07:00
1adec812fa
Please, please, pretty please try to stay away from the exec plugin whereever possible. It ussually ends up being non portable across developer operating systems. Most commands like cp have a perfectly usable equivalent in ant like the copy task.
2013-04-26 14:00:01 +02:00
93ef3ad550
CLOUDSTACK-1567 ui and api changes
2013-04-26 16:32:21 +05:30
318c7f2af0
CLOUDSTACK-1794 Throwing error when configuring egress rules for shared networks
2013-04-26 15:09:41 +05:30
3a9001bfb6
Correcting the case for secondary storage limit
2013-04-26 14:18:40 +05:30
c65ad6b8e8
CLOUDSTACK-2161 coping /etc/iptables/iptables-* to /etc/iptables/rules to work for old templates
...
In 4.2 templates iptables-persistent is looking for /etc/iptables/rules.v4 file but the old templates 4.1 and earlier
are looking for /etc/iptables/rules.
So coping the file to both rules and rules.v4
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-26 13:43:13 +05:30
c34233d5b1
Fix small typo
2013-04-26 08:56:29 +02:00
0412c95ef8
CLOUDSTACK-2152 Fix rel number, needs to be present
2013-04-26 08:56:29 +02:00
2f40a90c53
Multiple fixes to marvin framework
...
1. adding hypervisor information to configs
TODO: support for multi-hypervisor zones?
2. CLOUDSTACK-601: Marvin unicode decode errors when running mysql
queries via dbClient
3. adding keypair support for remotessh client
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-26 12:16:08 +05:30
f429c6687b
Don't allow success to be reported when we fail to stop vm due to no agent
...
connection
BUG-ID: CLOUDSTACK-2195
Bugfix-for: 4.2
Reviewed-by: Edison Su
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1366950954 -0600
2013-04-25 22:35:54 -06:00
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
64635abba5
CLOUDSTACK-1910: UI- Regions menu - GSLB - View assigned load balancing - refresh data.
2013-04-25 16:03:02 -07:00
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
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
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
880f98c023
Update affinity icon
2013-04-25 13:21:15 -07:00
6802b9dac6
Add icon for affinity groups section
2013-04-25 11:23:31 -07:00
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
5ce289034d
Merge branch 'ui-vm-affinity'
2013-04-25 11:04:35 -07:00
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
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
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
6bc0b70f38
CLOUDSTACK-2186:migrateVolume API gets undefined storageid
2013-04-25 19:40:44 +05:30
cfc0633ec7
Fix a issue with the russian Web UI (one key with a '\n' as value)
2013-04-25 12:27:21 +00:00
0e2ffe72aa
add lang key for Catalan, German, Italian, Norwegian. (from 4.1 branch)
2013-04-25 10:01:29 +00:00
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
1f97b528c5
CLOUDSTACK-1573 listNics response update for not showing vlan to normal user
2013-04-25 14:48:41 +05:30
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
76e40ba5ad
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
2013-04-25 12:34:10 +05:30
c8bfbfda31
CLOUDSTACK-1903:Delete event/alerts date parameter handling
2013-04-25 12:33:24 +05:30
0c1d2680a5
remove a debug log in vmwareResource
2013-04-25 14:25:03 +08:00
Milamber
Sebastien Goasguen
Pranav Saxena
Girish Shilamkar
Harikrishna Patnala
sanjeevneelarapu
Jessica Wang
Jessica Wang
Hugo Trippaers
Radhika PC
Jayapal
Ashutosh Kelkar
Marcus Sorensen
Min Chen
Prachi Damle
Brian Federle
Nicolas Lamirault
Mice Xia