summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Angel Ajo <mangelajo@redhat.com>2017-03-15 11:18:22 +0100
committerMiguel Angel Ajo <mangelajo@redhat.com>2017-03-15 11:18:33 +0100
commit5b9c82746b10d07ba8b61a9b389c2a48fec52488 (patch)
tree401aa392381fe7bb31c37aaf7a29bcb41d47879f
parent27b28c12f2da85a7324cb84eefc9935ab96bf25a (diff)
Bump version to 1.1.0 for release1.1.0
Notes
Notes (review): Code-Review+2: Gorka Eguileor <geguileo@redhat.com> Workflow+1: Gorka Eguileor <geguileo@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 15 Mar 2017 10:21:09 +0000 Reviewed-on: https://review.openstack.org/445862 Project: openstack/os-log-merger Branch: refs/heads/master
-rw-r--r--CHANGELOG.rst3
-rw-r--r--oslogmerger/oslogmerger.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f42fc95..f4d0c79 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,7 +1,7 @@
1Changelog 1Changelog
2========= 2=========
3 3
41.1.0 (unreleased) 41.1.0 (2017-03-17)
5------------------ 5------------------
6 6
7**Features:** 7**Features:**
@@ -17,6 +17,7 @@ Changelog
17**Bugfixes:** 17**Bugfixes:**
18 18
19- #13: timestamp output adding 000 to microseconds. 19- #13: timestamp output adding 000 to microseconds.
20- lp#1672921: os-log-merger crashes on strings with null bytes
20 21
211.0.3 (2015-11-08) 221.0.3 (2015-11-08)
22------------------ 23------------------
diff --git a/oslogmerger/oslogmerger.py b/oslogmerger/oslogmerger.py
index cd7ce74..18bea22 100644
--- a/oslogmerger/oslogmerger.py
+++ b/oslogmerger/oslogmerger.py
@@ -9,7 +9,7 @@ import time
9import urllib2 9import urllib2
10 10
11 11
12__version__ = '1.0.6' 12__version__ = '1.1.0'
13 13
14EXTRALINES_PADDING = " " * 40 14EXTRALINES_PADDING = " " * 40
15CACHE_DIR = "%s/oslogmerger-cache/" % tempfile.gettempdir() 15CACHE_DIR = "%s/oslogmerger-cache/" % tempfile.gettempdir()