From 9525c3fea70801ef308f05f80c4c8c3c7026c47a Mon Sep 17 00:00:00 2001
From: Joakim Hamren <joakim.hamren@gmail.com>
Date: Sat, 29 Mar 2014 09:20:35 +0100
Subject: [PATCH] v0.1.1

---
 .gitignore    | 3 ++-
 CHANGELOG     | 6 ++----
 README.md     | 5 +----
 psdash/web.py | 2 +-
 setup.py      | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index a5199a5..78f997c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.pyc
-*.egg-info
\ No newline at end of file
+*.egg-info
+.pypirc
\ No newline at end of file
diff --git a/CHANGELOG b/CHANGELOG
index d1e5041..943ff2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
---- v0.1.1 [Not released yet] ---
+--- v0.1.1 [2014-03-29] ---
 
 * [FIX] Fixed error when specifying a unreadable log file. psdash will now check that
         each log file is readable on startup.
@@ -7,6 +7,4 @@
 
 * [NEW] Added a PSDASH_ prefix on all psdash specific configuration options.
 
-
-
-
+* [FIX] Added argparse to setup.py requirements for Python 2.6 compatibility
diff --git a/README.md b/README.md
index 4e126a2..21e4bf0 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Available command-line arguments:
 ```
 usage: psdash [-h] [-l path] [-b host] [-p port] [-d]
 
-psdash 0.1.0 - system information web dashboard
+psdash 0.1.1 - system information web dashboard
 
 optional arguments:
   -h, --help            show this help message and exit
@@ -73,9 +73,6 @@ If this is set, only provided ip addresses will be allowed to access psdash.
 Addresses is separated by a comma.<br>
 eg: `PSDASH_ALLOWED_REMOTE_ADDRESSES = "10.0.0.2, 192.29.20.2"`
 
-**NOTE:** The prefix `PSDASH_` is not present in the latest release 0.1.0.<br>
-As such, the options are `AUTH_USERNAME`, `AUTH_PASSWORD` and `ALLOWED_REMOTE_ADDRESSES` in the 0.1.0 release.
-
 ## Screenshots
 
 Overview:
diff --git a/psdash/web.py b/psdash/web.py
index 46c3cb3..ec43923 100755
--- a/psdash/web.py
+++ b/psdash/web.py
@@ -364,7 +364,7 @@ def search_log():
 
 def parse_args():
     parser = argparse.ArgumentParser(
-        description="psdash %s - system information web dashboard" % "0.1.0"
+        description="psdash %s - system information web dashboard" % "0.1.1"
     )
     parser.add_argument(
         "-l", "--log",
diff --git a/setup.py b/setup.py
index 7676227..a44148c 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name="psdash",
-    version="0.1.0",
+    version="0.1.1",
     description="Linux system information web dashboard",
     long_description="psdash is a system information web dashboard for linux using data mainly served by psutil",
     classifiers=[