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 64FB891A8 for ; Tue, 5 Mar 2013 00:20:20 +0000 (UTC) Received: (qmail 87816 invoked by uid 500); 5 Mar 2013 00:20:20 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 87796 invoked by uid 500); 5 Mar 2013 00:20:20 -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 87786 invoked by uid 99); 5 Mar 2013 00:20:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Mar 2013 00:20:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EE395314A93; Tue, 5 Mar 2013 00:20:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: refs/heads/master - CLOUDSTACK-1502 Fixed the api-doc build component caused by new API commands: Message-Id: <20130305002019.EE395314A93@tyr.zones.apache.org> Date: Tue, 5 Mar 2013 00:20:19 +0000 (UTC) Updated Branches: refs/heads/master 48aa035a7 -> 7a54458e1 CLOUDSTACK-1502 Fixed the api-doc build component caused by new API commands: addIpToNic removeIpFromNic listNics 1) Removed trailing whitespaces from commands.properties file for the commands above 2) Created a new category "Nic" in gen_toc.py for the new commands Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7a54458e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7a54458e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7a54458e Branch: refs/heads/master Commit: 7a54458e172fa325d520970bd0dd84aece61f292 Parents: 48aa035 Author: Alena Prokharchyk Authored: Mon Mar 4 16:15:16 2013 -0800 Committer: Alena Prokharchyk Committed: Mon Mar 4 16:19:08 2013 -0800 ---------------------------------------------------------------------- client/tomcatconf/commands.properties.in | 6 +++--- tools/apidoc/gen_toc.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a54458e/client/tomcatconf/commands.properties.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index bbb3d30..dd0c3f8 100644 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -327,9 +327,9 @@ removeNicFromVirtualMachine=15 updateDefaultNicForVirtualMachine=15 #### -addIpToNic=15; -removeIpFromNic=15; -listNics=15; +addIpToNic=15 +removeIpFromNic=15 +listNics=15 #### SSH key pair commands registerSSHKeyPair=15 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a54458e/tools/apidoc/gen_toc.py ---------------------------------------------------------------------- diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py index 2fd855d..6292c53 100644 --- a/tools/apidoc/gen_toc.py +++ b/tools/apidoc/gen_toc.py @@ -132,6 +132,9 @@ known_categories = { 'Condition': 'AutoScale', 'Api': 'API Discovery', 'Region': 'Region', + 'addIpToNic': 'Nic', + 'removeIpFromNic': 'Nic', + 'listNics':'Nic', }