Return-Path: 
 <commits-return-54470-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7004E189A7
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Sat, 16 Jan 2016 18:43:36 +0000 (UTC)
Received: (qmail 9936 invoked by uid 500); 16 Jan 2016 18:43:36 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 9775 invoked by uid 500); 16 Jan 2016 18:43:36 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 9665 invoked by uid 99); 16 Jan 2016 18:43:36 -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; Sat, 16 Jan 2016 18:43:36 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 08033E07F7; Sat, 16 Jan 2016 18:43:36 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: remi@apache.org
To: commits@cloudstack.apache.org
Date: Sat, 16 Jan 2016 18:43:36 -0000
Message-Id: <7e2297a24e534ce1b0ebdcccd7d23010@git.apache.org>
In-Reply-To: <556c1352885346cd8a8558650b2902c2@git.apache.org>
References: <556c1352885346cd8a8558650b2902c2@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] git commit: updated refs/heads/4.7 to b4ebfb6

Merge pull request #1298 from remibergsma/staticroute_delete_47

CLOUDSTACK-9204 Do not error when staticroute is already goneWhen deleting a static route fails because it isn't there any more (KeyError), it should succeed instead.

Error seen:
```
[INFO] Processing JSON file static_routes.json.1451560145
Traceback (most recent call last):
File "/opt/cloud/bin/update_config.py", line 140, in <module>
process_file()
File "/opt/cloud/bin/update_config.py", line 52, in process_file
qf.load(None)
File "/opt/cloud/bin/merge.py", line 258, in load
proc = updateDataBag(self)
File "/opt/cloud/bin/merge.py", line 91, in _init_
self.process()
File "/opt/cloud/bin/merge.py", line 131, in process
dbag = self.process_staticroutes(self.db.getDataBag())
File "/opt/cloud/bin/merge.py", line 179, in process_staticroutes
return cs_staticroutes.merge(dbag, self.qFile.data)
File "/opt/cloud/bin/cs_staticroutes.py", line 26, in merge
del dbag[key]
KeyError: u'192.168.0.3'
```

* pr/1298:
  CLOUDSTACK-9204 Do not error when staticroute is already gone

Signed-off-by: Remi Bergsma <github@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b4ebfb64
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b4ebfb64
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b4ebfb64

Branch: refs/heads/4.7
Commit: b4ebfb640e4514e45190846965b4a6a77bb3ae8a
Parents: 317c28a 779f4b3
Author: Remi Bergsma <github@remi.nl>
Authored: Sat Jan 16 19:43:24 2016 +0100
Committer: Remi Bergsma <github@remi.nl>
Committed: Sat Jan 16 19:43:24 2016 +0100

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------