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 943AD200C86 for ; Wed, 17 May 2017 07:09:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 92BC0160BC1; Wed, 17 May 2017 05:09:51 +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 0BA5E160BC9 for ; Wed, 17 May 2017 07:09:50 +0200 (CEST) Received: (qmail 61004 invoked by uid 500); 17 May 2017 05:09:50 -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 60995 invoked by uid 99); 17 May 2017 05:09:50 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 May 2017 05:09:50 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 1F38F812D2; Wed, 17 May 2017 05:09:48 +0000 (UTC) Date: Wed, 17 May 2017 05:09:49 +0000 To: "commits@cloudstack.apache.org" Subject: [cloudstack] 01/01: Merge pull request #1842 from anshul1886/CLOUDSTACK-9686 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: rajani@apache.org Reply-To: "commits@cloudstack.apache.org" In-Reply-To: <149499778846.6822.2209033047783905034@gitbox.apache.org> References: <149499778846.6822.2209033047783905034@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: cloudstack X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 0fefc207f0588aeaa6d0ecd24915eac03c993c79 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.3.dev Auto-Submitted: auto-generated Message-Id: <20170517050949.1F38F812D2@gitbox.apache.org> archived-at: Wed, 17 May 2017 05:09:51 -0000 This is an automated email from the ASF dual-hosted git repository. rajani pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 0fefc207f0588aeaa6d0ecd24915eac03c993c79 Merge: 339fe4c 929595c Author: Rajani Karuturi AuthorDate: Wed May 17 10:39:45 2017 +0530 Merge pull request #1842 from anshul1886/CLOUDSTACK-9686 CLOUDSTACK-9686: Fixed multiple entires for builtin template in template .../src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .