[6/6] git commit: updated refs/heads/master to b1c7d4b

[re...@apache.org]

Merge pull request #967 from ekholabs/fix/cleanup-CLOUDSTACK-8935

CLOUDSTACK-8935 - Cannot remove [r]VPC networks due to RTNETLINK errorThis PR fixes the "sequence item 0: expected string, NoneType found" error found in the CsDhcp.py file when attempting to remo a network from a VPC.

* pr/967:
  CLOUDSTACK-8935 - Filter the DNS list because it might contain 1 None entry which breaks the code.
  CLOUDSTACK-8935 - Clean up network resources in the right order
  CLOUDSTACK-8935 - Do not retry 60 times when we expect the SSH to fail
  CLOUDSTACK-8935 - Check if the key is available in the dictionary
  CLOUDSTACK-8935 - Add a check to avoid exception related to None value

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


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

Branch: refs/heads/master
Commit: b1c7d4b20de9e6c2f38b5c5e9be761707f1c56c1
Parents: ecc2e2f a01720b
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Oct 24 09:14:56 2015 +0200
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Oct 24 09:14:56 2015 +0200

----------------------------------------------------------------------
 .../debian/config/opt/cloud/bin/cs/CsDhcp.py    |   8 +-
 .../config/opt/cloud/bin/cs/CsGuestNetwork.py   |   2 +-
 .../integration/component/test_vpc_offerings.py | 196 ++++++++++---------
 test/integration/smoke/test_network.py          |   7 +-
 4 files changed, 118 insertions(+), 95 deletions(-)
----------------------------------------------------------------------