Bump version to 1.1.0 for release

Change-Id: I0461a7bf6ef78ff2afeb2c38ea4478b4b3cda46c
This commit is contained in:
Miguel Angel Ajo 2017-03-15 11:18:22 +01:00
parent 27b28c12f2
commit 5b9c82746b
2 changed files with 3 additions and 2 deletions

View File

@ -1,7 +1,7 @@
Changelog
=========
1.1.0 (unreleased)
1.1.0 (2017-03-17)
------------------
**Features:**
@ -17,6 +17,7 @@ Changelog
**Bugfixes:**
- #13: timestamp output adding 000 to microseconds.
- lp#1672921: os-log-merger crashes on strings with null bytes
1.0.3 (2015-11-08)
------------------

View File

@ -9,7 +9,7 @@ import time
import urllib2
__version__ = '1.0.6'
__version__ = '1.1.0'
EXTRALINES_PADDING = " " * 40
CACHE_DIR = "%s/oslogmerger-cache/" % tempfile.gettempdir()