[2/4] git commit: updated refs/heads/master to e8de07a

[bh...@apache.org]

Merge pull request #1801 from murali-reddy/test_router_dhcp_opts

fix marvin test failure test_router_dhcp_optsmarvin, VirtualMachine object's, nic attribute does not have nic's in any
particualr order in the array. so check isdefault attribute to the get non-default nic

earlier test made assumption that nic[0] is default nic, which is not true always

* pr/1801:
  CLOUDSTACK-9634: fix marvin test failure test_router_dhcp_opts

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


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

Branch: refs/heads/master
Commit: b57d0ae7c34650a56c10a96c5c86105fffb3a8c3
Parents: 5811d33 a07e7ac
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 1 10:37:32 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 1 10:37:32 2016 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_router_dhcphosts.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------