From 7fc450d375a60f4be68fba459c039da1e875d8f4 Mon Sep 17 00:00:00 2001
From: Joakim Hamren <joakim.hamren@gmail.com>
Date: Wed, 24 Sep 2014 22:26:15 +0200
Subject: [PATCH] v0.6.0

---
 CHANGELOG          | 4 +++-
 psdash/__init__.py | 2 +-
 psdash/run.py      | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 19353fd..0a5193c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,11 @@
---- v0.6.0 [Not released] ---
+--- v0.6.0 [2014-09-24] ---
 
 * [NEW] Major updates to the UI design.
 
 * [NEW] Added user proceses filtering to processes page.
 
+* [FIX] Fixed bug where the highlighted text when searching a log could be misplaced.
+
 --- v0.5.0 [2014-09-06] ---
 
 * [NEW] Added HTTPS support.
diff --git a/psdash/__init__.py b/psdash/__init__.py
index 5a28280..da74604 100644
--- a/psdash/__init__.py
+++ b/psdash/__init__.py
@@ -1 +1 @@
-__version__ = "0.5.0"
\ No newline at end of file
+__version__ = "0.6.0"
\ No newline at end of file
diff --git a/psdash/run.py b/psdash/run.py
index 6d04a7a..22c1c64 100644
--- a/psdash/run.py
+++ b/psdash/run.py
@@ -12,6 +12,7 @@
 from logging import getLogger
 from flask import Flask
 import zerorpc
+from psdash import __version__
 from psdash.node import LocalNode, RemoteNode
 from psdash.web import fromtimestamp
 
@@ -42,7 +43,7 @@ def __init__(self, config_overrides=None, args=tuple()):
 
     def _get_args(cls, args):
         parser = argparse.ArgumentParser(
-            description='psdash %s - system information web dashboard' % '0.5.0'
+            description='psdash %s - system information web dashboard' % __version__
         )
         parser.add_argument(
             '-l', '--log',
@@ -279,7 +280,7 @@ def _run_web(self):
         self.server.serve_forever()
 
     def run(self):
-        logger.info('Starting psdash v0.5.0')
+        logger.info('Starting psdash v%s' % __version__)
 
         self._setup_locale()
         self._setup_workers()