Merge branch 'hotfix/CLOUDSTACK-7776' of
https://git-wip-us.apache.org/repos/asf/cloudstack into hotfix/CLOUDSTACK-7776
Conflicts:
server/src/com/cloud/network/NetworkServiceImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9e89a285
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9e89a285
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9e89a285
Branch: refs/heads/hotfix/CLOUDSTACK-7776
Commit: 9e89a2858c2636792a4cd26696d405217abdc742
Parents: 2198b9d cf2cd58
Author: Daan Hoogland <d...@onecht.net>
Authored: Thu Oct 23 22:11:22 2014 +0200
Committer: Daan Hoogland <d...@onecht.net>
Committed: Thu Oct 23 22:11:22 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
