From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Thu, 14 Jul 2016 18:52:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.1~97
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=aba0a5ebb8a7c606e988bbbb01c7875447d23ebe;hp=-c

Merge remote-tracking branch 'upstream/master'
---

aba0a5ebb8a7c606e988bbbb01c7875447d23ebe
diff --combined README.md
index 963aec1,6c37a68..a6b1de5
--- a/README.md
+++ b/README.md
@@@ -55,6 -55,7 +55,6 @@@ Despite of this son-emu has the followi
  * [flask_restful](https://pypi.python.org/pypi/Flask-RESTful) >= 0.3 (BSD)
  * [networkx](https://pypi.python.org/pypi/networkx/) >= 1.11  (BSD)
  * [oslo.config](http://docs.openstack.org/developer/oslo.config/) >= 3.9.0  (Apache 2.0)
 -* [paramiko](https://pypi.python.org/pypi/paramiko/1.16.0) >= 1.6 (LGPL)
  * [prometheus_client](https://pypi.python.org/pypi/prometheus_client) >= 0.0.13 (Apache 2.0)
  * [pyaml](https://pypi.python.org/pypi/pyaml) >=15.8.2 (WTFPL)
  * [pytest-runner](https://pypi.python.org/pypi/pytest-runner) >= 2.8 (MIT)
@@@ -159,6 -160,12 +159,12 @@@ The following lead developers are respo
  * Manuel Peuster (https://github.com/mpeuster)
  * Steven Van Rossem (https://github.com/stevenvanrossem)
  
+ #### Contributors
+ 
+ * Hadi Razzaghi Kouchaksaraei (https://github.com/hadik3r)
+ * Wouter Tavernier (https://github.com/wtaverni)
+ * Geoffroy Chollon (https://github.com/cgeoffroy)
+ 
  #### Feedback-Chanel
  
  * You may use the mailing list [sonata-dev@lists.atosresearch.eu](mailto:sonata-dev@lists.atosresearch.eu)
diff --combined setup.py
index fbd8650,b8fad8a..d23ea68
--- a/setup.py
+++ b/setup.py
@@@ -28,7 -28,7 +28,7 @@@ partner consortium (www.sonata-nfv.eu)
  from setuptools import setup, find_packages
  
  setup(name='emuvim',
-       version='0.0.1',
+       version='0.9',
        license='Apache 2.0',
        description='emuvim is a VIM for the SONATA platform',
        url='http://github.com/sonata-emu',
@@@ -51,6 -51,7 +51,6 @@@
            'docker-py==1.7.1',
            'requests',
            'prometheus_client',
 -          'paramiko',
            'urllib3'
        ],
        zip_safe=False,
diff --combined utils/vagrant/motd
index ea9e8ca,df6b388..df6b388
mode 100755,100644..100755
--- a/utils/vagrant/motd
+++ b/utils/vagrant/motd
@@@ -12,6 -12,6 +12,6 @@@
  ** - sudo python sonata_y1_demo_topology_1.py             **
  **                                                        **
  ** The emulator will be started and the fake-gatekeeper   **
- ** API will be accessible on port 5000 from both, the     **
+ ** API will be accessible on port 5000 from both the      **
  ** VM and your host machine.                              **
  ************************************************************