Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B9879D0DE for ; Thu, 10 Jan 2013 00:59:34 +0000 (UTC) Received: (qmail 32115 invoked by uid 500); 10 Jan 2013 00:59:34 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 32087 invoked by uid 500); 10 Jan 2013 00:59:34 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 32073 invoked by uid 99); 10 Jan 2013 00:59:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2013 00:59:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 44A45124A1; Thu, 10 Jan 2013 00:59:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mlsorensen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [50/50] [abbrv] git commit: Merge branch 'master' into resizevolume Fixing conflicts Message-Id: <20130110005934.44A45124A1@tyr.zones.apache.org> Date: Thu, 10 Jan 2013 00:59:34 +0000 (UTC) Updated Branches: refs/heads/resizevolume c4c9d2d87 -> d8056c931 Merge branch 'master' into resizevolume Fixing conflicts Conflicts: api/src/com/cloud/exception/CloudException.java api/src/com/cloud/storage/StorageService.java api/src/com/cloud/storage/Volume.java client/tomcatconf/commands.properties.in server/src/com/cloud/storage/StorageManagerImpl.java setup/db/create-schema-view.sql Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d8056c93 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d8056c93 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d8056c93 Branch: refs/heads/resizevolume Commit: d8056c931e1ebc5ddb77d3087367ba2b3ef58799 Parents: c4c9d2d dcbb0ec Author: Marcus Sorensen Authored: Wed Jan 9 18:00:09 2013 -0700 Committer: Marcus Sorensen Committed: Wed Jan 9 18:00:09 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/exception/CloudException.java | 9 -- docs/en-US/images/compute-service-offerings.png | Bin 0 -> 75482 bytes .../network/CiscoNexusVSMDeviceManagerImpl.java | 94 ++++++++------- 3 files changed, 48 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8056c93/api/src/com/cloud/exception/CloudException.java ---------------------------------------------------------------------- diff --cc api/src/com/cloud/exception/CloudException.java index 2ec6142,8f1fa37..fd83956 --- a/api/src/com/cloud/exception/CloudException.java +++ b/api/src/com/cloud/exception/CloudException.java @@@ -56,15 -56,7 +56,6 @@@ public class CloudException extends Exc return; } - public void addProxyObject(Object voObj, Long id, String idFieldName) { - // Get the VO object's table name. - String tablename = AnnotationHelper.getTableName(voObj); - if (tablename != null) { - addProxyObject(tablename, id, idFieldName); - } - return; - } -- public ArrayList getIdProxyList() { return idList; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d8056c93/client/tomcatconf/commands.properties.in ---------------------------------------------------------------------- diff --cc client/tomcatconf/commands.properties.in index f27b01c,3872f2a..f27b01c mode 100755,100644..100644 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in