Skip to content

Commit 3ecc52a

Browse files
xueyuanxueyuan
committed
Re-absorb delta in master into vmsync
2 parents 306d090 + 43ab950 commit 3ecc52a

24 files changed

Lines changed: 677 additions & 754 deletions

File tree

server/src/com/cloud/agent/manager/allocator/PodAllocator.java renamed to api/src/com/cloud/agent/manager/allocator/PodAllocator.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,15 @@
1919
import java.util.Set;
2020

2121
import com.cloud.dc.DataCenter;
22-
import com.cloud.dc.DataCenterVO;
23-
import com.cloud.dc.HostPodVO;
2422
import com.cloud.dc.Pod;
25-
import com.cloud.service.ServiceOfferingVO;
23+
import com.cloud.offering.ServiceOffering;
2624
import com.cloud.template.VirtualMachineTemplate;
2725
import com.cloud.utils.Pair;
2826
import com.cloud.utils.component.Adapter;
2927
import com.cloud.vm.VirtualMachineProfile;
3028

3129
public interface PodAllocator extends Adapter {
32-
Pair<HostPodVO, Long> allocateTo(VirtualMachineTemplate template, ServiceOfferingVO offering, DataCenterVO dc, long userId, Set<Long> avoids);
30+
Pair<Pod, Long> allocateTo(VirtualMachineTemplate template, ServiceOffering offering, DataCenter dc, long userId, Set<Long> avoids);
3331

3432
Pod allocateTo(VirtualMachineProfile vm, DataCenter dc, Set<? extends Pod> avoids);
3533
}

‎client/WEB-INF/classes/resources/messages_ar.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ message.pending.projects.1=\u0644\u062f\u064a\u0643 \u062f\u0639\u0648\u0627\u06
251251
message.pending.projects.2=\u0644\u0639\u0631\u0636\u060c \u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u0630\u0647\u0627\u0628 \u0625\u0644\u0649 \u0642\u0633\u0645 \u0627\u0644\u0645\u0634\u0627\u0631\u064a\u0639\u060c \u062b\u0645 \u062d\u062f\u062f \u062f\u0639\u0648\u0627\u062a \u0645\u0646 \u0627\u0644\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0645\u0646\u0633\u062f\u0644\u0629.
252252
message.please.select.networks=\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u062e\u062a\u064a\u0627\u0631 \u0627\u0644\u0634\u0628\u0643\u0627\u062a \u0644\u062c\u0647\u0627\u0632\u0643 \u0627\u0644\u0625\u0641\u062a\u0631\u0627\u0636\u064a
253253
message.project.invite.sent=\u062a\u0645 \u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u062f\u0639\u0648\u0629 ; \u0633\u064a\u062a\u0645 \u0625\u0636\u0627\u0641\u062a\u0647\u0645 \u0625\u0644\u0649 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0628\u0645\u062c\u0631\u062f \u0642\u0628\u0648\u0644 \u0627\u0644\u062f\u0639\u0648\u0629
254-
message.remove.vpc=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u0627\u0644\u0640VPC
254+
message.remove.vpc=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0631\u063a\u0628\u062a\u0643 \u0641\u064a \u062d\u0630\u0641 \u0627\u0644\u0640VPC
255255
message.reset.password.warning.notPasswordEnabled=\u0627\u0644\u0642\u0627\u0644\u0628 \u0644\u0647\u0630\u0627 \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u062a\u0645 \u0627\u0646\u0634\u0627\u0626\u0647 \u0645\u0646 \u062f\u0648\u0646 \u0643\u0644\u0645\u0629 \u0645\u0631\u0648\u0631 \u0645\u0645\u0643\u0646\u0629
256256
message.reset.password.warning.notStopped=\u064a\u062c\u0628 \u0625\u064a\u0642\u0627\u0641 \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u0627\u0644\u062e\u0627\u0635 \u0628\u0643 \u0642\u0628\u0644 \u0645\u062d\u0627\u0648\u0644\u0629 \u062a\u063a\u064a\u064a\u0631 \u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631 \u0627\u0644\u062d\u0627\u0644\u064a\u0629
257257
message.reset.VPN.connection=\u064a\u0631\u062c\u0649 \u062a\u0623\u0643\u064a\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0625\u0639\u0627\u062f\u0629-\u0636\u0628\u0637 \u0625\u062a\u0635\u0627\u0644 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 VPN

‎client/WEB-INF/classes/resources/messages_fr_FR.properties‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ label.account.name=Nom du compte
5050
label.accounts=Comptes
5151
label.account.specific=Sp\u00e9cifique au compte
5252
label.acquire.new.ip=Acqu\u00e9rir une nouvelle adresse IP
53+
label.acquire.new.secondary.ip=Acqu\u00e9rir une nouvelle IP secondaire
5354
label.action.attach.disk.processing=Rattachement du Disque...
5455
label.action.attach.disk=Rattacher un disque
5556
label.action.attach.iso.processing=Rattachement de l\\'image ISO
@@ -240,7 +241,7 @@ label.add.accounts=Ajouter des comptes
240241
label.add.accounts.to=Ajouter des comptes sur
241242
label.add.account.to.project=Ajouter un compte au projet
242243
label.add.ACL=Ajouter r\u00e8gle ACL
243-
label.add.affinity.group=Ajouter nouvea groupe d\\'affinit\u00e9
244+
label.add.affinity.group=Ajouter nouveau groupe d\\'affinit\u00e9
244245
label.add=Ajouter
245246
label.add.BigSwitchVns.device=Ajouter contr\u00f4leur BigSwitch Vns
246247
label.add.by=Ajout\u00e9 par
@@ -316,7 +317,7 @@ label.advanced.mode=Mode avanc\u00e9
316317
label.advanced.search=Recherche avanc\u00e9e
317318
label.affinity=Affinit\u00e9
318319
label.affinity.group=Groupe d\\'Affinit\u00e9
319-
label.affinity.groups=Groups d\\'Affinit\u00e9
320+
label.affinity.groups=Groupes d\\'Affinit\u00e9
320321
label.agent.password=Mot de passe Agent
321322
label.agent.username=Identifiant Agent
322323
label.agree=Accepter
@@ -390,7 +391,6 @@ label.code=Code
390391
label.community=Communaut\u00e9
391392
label.compute.and.storage=Calcul et Stockage
392393
label.compute.offering=Offre de calcul
393-
label.compute.offerings=Offres de calcul
394394
label.compute=Processeur
395395
label.configuration=Configuration
396396
label.configure=Configurer
@@ -462,10 +462,14 @@ label.disable.vpn=D\u00e9sactiver le VPN
462462
label.disabling.vpn.access=D\u00e9sactiver l\\'acc\u00e8s VPN
463463
label.disk.allocated=Disque Allou\u00e9
464464
label.disk.offering=Offre de Disque
465+
label.disk.read.bytes=Lecture Disque (Octets)
466+
label.disk.read.io=Lecture Disque (IO)
465467
label.disk.size.gb=Taille du disque (en Go)
466468
label.disk.size=Taille du disque
467469
label.disk.total=Espace disque total
468470
label.disk.volume=Volume disque
471+
label.disk.write.bytes=\u00c9criture Disque (Octets)
472+
label.disk.write.io=\u00c9criture Disque (IO)
469473
label.display.name=Nom commun
470474
label.display.text=Texte affich\u00e9
471475
label.dns.1=DNS 1
@@ -653,7 +657,6 @@ label.launch.zone=D\u00e9marrer la zone
653657
label.LB.isolation=R\u00e9partition de charge isol\u00e9e
654658
label.least.connections=Le moins de connexions
655659
label.level=Niveau
656-
label.linklocal.ip=Adresse IP de lien local
657660
label.load.balancer=R\u00e9partiteur de charge
658661
label.load.balancing.policies=R\u00e8gles de r\u00e9partition de charge
659662
label.load.balancing=R\u00e9partition de charge
@@ -1113,6 +1116,7 @@ label.view.all=Voir tout
11131116
label.view.console=Voir la console
11141117
label.viewing=Consultation en cours
11151118
label.view.more=Voir plus
1119+
label.view.secondary.ips=Voir IPs secondaires
11161120
label.view=Voir
11171121
label.virtual.appliance=Appliance Virtuelle
11181122
label.virtual.appliances=Appliances Virtuelles
@@ -1183,6 +1187,7 @@ label.zoneWizard.trafficType.public=Public \: Trafic entre Internet et les machi
11831187
label.zoneWizard.trafficType.storage=Stockage \: Trafic entre les serveurs de stockages principaux et secondaires, tel que le transfert de machines virtuelles mod\u00e8les et des instantan\u00e9s de disques
11841188
label.zone=Zone
11851189
managed.state=\u00c9tat de la gestion
1190+
message.acquire.ip.nic=Confirmez que vous souhaitez acqu\u00e9rir une nouvelle IP secondaire pour cette carte NIC.<br/>N.B. Vous devez configurer manuellement la nouvelle IP secondaire dans la machine virtuelle.
11861191
message.acquire.new.ip=Confirmer l\\'acquisition d\\'une nouvelle adresse IP pour ce r\u00e9seau.
11871192
message.acquire.new.ip.vpc=Veuillez confirmer que vous voulez une nouvelle adresse IP pour ce VPC
11881193
message.acquire.public.ip=S\u00e9lectionnez la zone dans laquelle vous voulez acqu\u00e9rir votre nouvelle adresse IP.

‎client/WEB-INF/classes/resources/messages_it_IT.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ label.action.stop.router=Arresto Router
212212
label.action.stop.router.processing=Arresto Router in corso....
213213
label.action.stop.systemvm=Arresto VM di Sistema
214214
label.action.stop.systemvm.processing=Arresto VM di Sistema in corso....
215+
label.action.take.snapshot.processing=Esecuzione di Snapshot in corso....
215216
label.action.update.OS.preference=Aggiornamento Preferenze OS
216217
label.action.update.OS.preference.processing=Aggiornamento preferenze OS in corso....
217218
label.activate.project=Attivare il Progetto
@@ -220,10 +221,14 @@ label.add.accounts=Aggiungere utenti
220221
label.add.accounts.to=Aggiungere utenti a
221222
label.add.account.to.project=Aggiungere account al progetto
222223
label.add.ACL=Aggiungere ACL
224+
label.add.cluster=Aggiunta Cluster
223225
label.add.compute.offering=Aggiungere una offerta computazionale
226+
label.add.domain=Aggiunta Dominio
224227
label.add.egress.rule=Aggiungere una regola d\\'uscita
225228
label.add.F5.device=Aggiungere device F5
229+
label.add.firewall=Aggiunta regola firewall
226230
label.add.guest.network=Aggiungere una rete guest
231+
label.add.host=Aggiunta Host
227232
label.additional.networks=Network Aggiuntivi
228233
label.add.netScaler.device=Aggiungere device Netscaler
229234
label.add.network.ACL=Aggiungere le ACL di rete
@@ -282,7 +287,6 @@ label.community=Community
282287
label.compute.and.storage=Computazione e Storage
283288
label.compute=Compute
284289
label.compute.offering=Offerta computazionale
285-
label.compute.offerings=Offerte computazionali
286290
label.configuration=Configurazione
287291
label.configure=Configurare
288292
label.configure.network.ACLs=Configurare le ACL di rete

0 commit comments

Comments
 (0)