From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Wed, 24 May 2017 09:23:28 +0000 (+0200)
Subject: Merge branch 'v2.0'
X-Git-Tag: v3.0.0~25
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b36e75da99170c650c999ab2b985a14f3b9a7b5a;hp=ec66e9ac6d550af4dcef27d786adc1a41bc30bbc;p=osm%2FRO.git

Merge branch 'v2.0'
---

diff --git a/osm_ro/vimconn_vmware.py b/osm_ro/vimconn_vmware.py
index 5b044581..a56054af 100644
--- a/osm_ro/vimconn_vmware.py
+++ b/osm_ro/vimconn_vmware.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ##
-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# Copyright 2016-2017 VMware Inc.
+# This file is part of ETSI OSM
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,7 +18,7 @@
 # under the License.
 #
 # For those usages not covered by the Apache License, Version 2.0 please
-# contact with: nfvlabs@tid.es
+# contact:  osslegalrouting@vmware.com
 ##
 
 """