6d0dbf5968) Conflicts: plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java (cherry picked from commit d38a503431) Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
6d0dbf5968
d38a503431