Merge remote-tracking branch 'origin/master'

This commit is contained in:
grossmj 2015-09-08 02:08:32 -06:00
commit 2a0f1586c8
2 changed files with 9 additions and 2 deletions

View File

@ -1,5 +1,12 @@
# Change Log
## 1.3.10 04/09/2015
* Catch exception when a process cannot be killed. Fixes #296.
* Backport: fixes NAT NIO for Qemu VMs (do not launch any legacy scripts)
* Fixes Unicode error. Fixes #290.
* Don't delete Dynamips ROM files. They are used to restore the nvram.
## 1.3.9 03/08/2015
* Backport: removes code that deletes IOS router instance files.

View File

@ -23,5 +23,5 @@
# or negative for a release candidate or beta (after the base version
# number has been incremented)
__version__ = "1.3.10dev1"
__version_info__ = (1, 3, 10, -99)
__version__ = "1.3.11dev1"
__version_info__ = (1, 3, 11, -99)