Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3B7899287 for ; Mon, 15 Dec 2014 08:43:35 +0000 (UTC) Received: (qmail 81426 invoked by uid 500); 15 Dec 2014 08:43:30 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 81331 invoked by uid 500); 15 Dec 2014 08:43:29 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 80720 invoked by uid 99); 15 Dec 2014 08:43:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Dec 2014 08:43:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 90C9F9C67AB; Mon, 15 Dec 2014 08:43:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Mon, 15 Dec 2014 08:43:47 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/20] git commit: updated refs/heads/hotfix/scp-exception to 7de94c9 Small typo correction, exisits -> exists Signed-off-by: Rajani Karuturi This closes #57 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cdc66c9e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cdc66c9e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cdc66c9e Branch: refs/heads/hotfix/scp-exception Commit: cdc66c9e70446b09fd272e8dde4dff89bb932f1e Parents: 1a66b3b Author: Sebastien Goasguen Authored: Fri Dec 12 17:59:59 2014 -0500 Committer: Rajani Karuturi Committed: Mon Dec 15 11:26:19 2014 +0530 ---------------------------------------------------------------------- .../src/com/cloud/network/security/SecurityGroupManagerImpl.java | 2 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- .../org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java | 4 ++-- .../src/org/apache/cloudstack/iam/server/IAMServiceImpl.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdc66c9e/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index cffdf8f..174106d 100644 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -870,7 +870,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro Account owner = _accountMgr.finalizeOwner(caller, cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId()); if (_securityGroupDao.isNameInUse(owner.getId(), owner.getDomainId(), cmd.getSecurityGroupName())) { - throw new InvalidParameterValueException("Unable to create security group, a group with name " + name + " already exisits."); + throw new InvalidParameterValueException("Unable to create security group, a group with name " + name + " already exists."); } return createSecurityGroup(cmd.getSecurityGroupName(), cmd.getDescription(), owner.getDomainId(), owner.getAccountId(), owner.getAccountName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdc66c9e/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 35556b1..4e3b16a 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2198,7 +2198,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir boolean isNameInUse = _vmGroupDao.isNameInUse(accountId, groupName); if (isNameInUse) { - throw new InvalidParameterValueException("Unable to create vm group, a group with name " + groupName + " already exisits for account " + accountId); + throw new InvalidParameterValueException("Unable to create vm group, a group with name " + groupName + " already exists for account " + accountId); } return createVmGroup(groupName, accountId); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdc66c9e/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java index b984b97..2139b5d 100644 --- a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java +++ b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java @@ -195,10 +195,10 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro } if (_affinityGroupDao.isNameInUse(owner.getAccountId(), owner.getDomainId(), affinityGroupName)) { - throw new InvalidParameterValueException("Unable to create affinity group, a group with name " + affinityGroupName + " already exisits."); + throw new InvalidParameterValueException("Unable to create affinity group, a group with name " + affinityGroupName + " already exists."); } if (domainLevel && _affinityGroupDao.findDomainLevelGroupByName(domainId, affinityGroupName) != null) { - throw new InvalidParameterValueException("Unable to create affinity group, a group with name " + affinityGroupName + " already exisits under the domain."); + throw new InvalidParameterValueException("Unable to create affinity group, a group with name " + affinityGroupName + " already exists under the domain."); } final Account ownerFinal = owner; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdc66c9e/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java ---------------------------------------------------------------------- diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java b/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java index fa37cf6..bfeb979 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java +++ b/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java @@ -153,7 +153,7 @@ public class IAMServiceImpl extends ManagerBase implements IAMService, Manager { if (grp != null) { throw new InvalidParameterValueException( "Unable to create acl group with name " + iamGroupName - + " already exisits for path " + path); + + " already exists for path " + path); } IAMGroupVO rvo = new IAMGroupVO(iamGroupName, description); rvo.setPath(path); @@ -372,7 +372,7 @@ public class IAMServiceImpl extends ManagerBase implements IAMService, Manager { if (ro != null) { throw new InvalidParameterValueException( "Unable to create acl policy with name " + iamPolicyName - + " already exisits"); + + " already exists"); } IAMPolicy role = Transaction.execute(new TransactionCallback() {