Browse Source

Bump version to 1.1.0 for release

Change-Id: I0461a7bf6ef78ff2afeb2c38ea4478b4b3cda46c
tags/1.1.0^0
Miguel Angel Ajo 2 years ago
parent
commit
5b9c82746b
2 changed files with 3 additions and 2 deletions
  1. 2
    1
      CHANGELOG.rst
  2. 1
    1
      oslogmerger/oslogmerger.py

+ 2
- 1
CHANGELOG.rst View File

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

+ 1
- 1
oslogmerger/oslogmerger.py View File

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

Loading…
Cancel
Save