Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 64A52200ACA for ; Wed, 18 May 2016 13:46:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 638091609B1; Wed, 18 May 2016 11:46:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BDD13160A1B for ; Wed, 18 May 2016 13:46:33 +0200 (CEST) Received: (qmail 46737 invoked by uid 500); 18 May 2016 11:46:26 -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 46185 invoked by uid 99); 18 May 2016 11:46:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 May 2016 11:46:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7B286E01BA; Wed, 18 May 2016 11:46:26 +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: Wed, 18 May 2016 11:46:41 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/51] [abbrv] git commit: updated refs/heads/4.9-bountycastle-daan to d8c42a9 archived-at: Wed, 18 May 2016 11:46:34 -0000 Merge pull request #1528 from mike-tutkowski/marvin_methods CLOUDSTACK-9373: Class methods over-shawdowing instance methodsWe have some methods in base.py that are named the same. Per my findings below, Python methods in a class should not be named the same even if one is a class method and the other is an instance method. The solution discussed on dev@ is to remove the instance versions (reason listed in e-mail text, which is listed in JIRA ticket). https://issues.apache.org/jira/browse/CLOUDSTACK-9373 * pr/1528: CLOUDSTACK-9373: Removing a few instance methods where there are class methods that are overshadowing them Signed-off-by: Will Stevens Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c79affae Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c79affae Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c79affae Branch: refs/heads/4.9-bountycastle-daan Commit: c79affaefb674a38c18ea008d4e1fb384b1ec6ca Parents: 7e41747 1ad0da0 Author: Will Stevens Authored: Thu May 12 11:08:53 2016 -0400 Committer: Will Stevens Committed: Thu May 12 11:08:53 2016 -0400 ---------------------------------------------------------------------- tools/marvin/marvin/lib/base.py | 21 --------------------- 1 file changed, 21 deletions(-) ----------------------------------------------------------------------