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 AC13D200CAE for ; Wed, 17 May 2017 07:49:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AAC0D160BC1; Wed, 17 May 2017 05:49:31 +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 29ED0160BC9 for ; Wed, 17 May 2017 07:49:31 +0200 (CEST) Received: (qmail 19079 invoked by uid 500); 17 May 2017 05:49:30 -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 19070 invoked by uid 99); 17 May 2017 05:49:30 -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:49:30 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 46EB5812D2; Wed, 17 May 2017 05:49:29 +0000 (UTC) Date: Wed, 17 May 2017 05:49:29 +0000 To: "commits@cloudstack.apache.org" Subject: [cloudstack] 01/01: Merge pull request #1971 from bvbharatk/CLOUDSTACK-9726 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: <149500016880.30651.17775126590693186827@gitbox.apache.org> References: <149500016880.30651.17775126590693186827@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: 83b93d2f601573322052212110b0483084fed074 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.3.dev Auto-Submitted: auto-generated Message-Id: <20170517054929.46EB5812D2@gitbox.apache.org> archived-at: Wed, 17 May 2017 05:49:31 -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 83b93d2f601573322052212110b0483084fed074 Merge: 7434d91 422787e Author: Rajani Karuturi AuthorDate: Wed May 17 11:19:25 2017 +0530 Merge pull request #1971 from bvbharatk/CLOUDSTACK-9726 CLOUDSTACK-9726 Update state is not changed to UPDATE_FAILED in case … .../cloud/network/element/RedundantResource.java | 1 + .../service/NetworkOrchestrationService.java | 4 ++- .../engine/orchestration/NetworkOrchestrator.java | 27 +++++++++++++++++- .../src/com/cloud/network/NetworkServiceImpl.java | 17 +++--------- .../network/element/VirtualRouterElement.java | 32 +++++++++++++++++----- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 7 ++++- .../component/maint/test_redundant_router.py | 4 +++ 7 files changed, 69 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .