From cf8d31603dcc8c645a35a7104997917de9cfc128 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: May 02 2016 20:08:04 +0000
Subject: Bump version to 1.2.0


Merges: #87
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Reviewed-by: Rob Crittenden <rcritten@redhat.com>

---

diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec
index 5be6b72..73ed30e 100644
--- a/contrib/fedora/ipsilon.spec
+++ b/contrib/fedora/ipsilon.spec
@@ -1,7 +1,7 @@
 # Bundling request for bootstrap/patternfly: https://fedorahosted.org/fpc/ticket/483
 
 Name:       ipsilon
-Version:    1.1.0
+Version:    1.2.0
 Release:    1%{?builddate}%{?gittag}%{?dist}
 Summary:    An Identity Provider Server
 
@@ -380,6 +380,9 @@ fi
 %{python2_sitelib}/ipsilon/info/infosssd.*
 
 %changelog
+* Mon May 02 2016 Patrick Uiterwijk <puiterwijk@redhat.com> - 1.2.0-1
+- Release 1.2.0
+
 * Sat Sep 05 2015 Patrick Uiterwijk <puiterwijk@redhat.com> - 1.1.0-1
 - Release 1.1.0
 
diff --git a/man/ipsilon-client-install.1 b/man/ipsilon-client-install.1
index 8a44b88..8259283 100644
--- a/man/ipsilon-client-install.1
+++ b/man/ipsilon-client-install.1
@@ -1,6 +1,6 @@
 .\" Copyright (C) 2015 Ipsilon Project Contributors
 .\"
-.TH "ipsilon-client-install" "1" "1.1.0" "Ipsilon" "Ipsilon Manual Pages"
+.TH "ipsilon-client-install" "1" "1.2.0" "Ipsilon" "Ipsilon Manual Pages"
 .SH "NAME"
 ipsilon\-client\-install \- Configure an Ipsilon client
 .SH "SYNOPSIS"
diff --git a/man/ipsilon-server-install.1 b/man/ipsilon-server-install.1
index bc03134..53ac354 100644
--- a/man/ipsilon-server-install.1
+++ b/man/ipsilon-server-install.1
@@ -1,6 +1,6 @@
 .\" Copyright (C) 2015 Ipsilon Project Contributors
 .\"
-.TH "ipsilon-server-install" "1" "1.1.0" "Ipsilon" "Ipsilon Manual Pages"
+.TH "ipsilon-server-install" "1" "1.2.0" "Ipsilon" "Ipsilon Manual Pages"
 .SH "NAME"
 ipsilon\-server\-install \- Configure an Ipsilon Identity Provider instance
 .SH "SYNOPSIS"
diff --git a/man/ipsilon.7 b/man/ipsilon.7
index 79f03a0..3a84e75 100644
--- a/man/ipsilon.7
+++ b/man/ipsilon.7
@@ -1,6 +1,6 @@
 .\" Copyright (C) 2015 Ipsilon Project Contributors
 .\"
-.TH "ipsilon" "7" "1.1.0" "Ipsilon" "Ipsilon Manual Pages"
+.TH "ipsilon" "7" "1.2.0" "Ipsilon" "Ipsilon Manual Pages"
 .SH "NAME"
 ipsilon
 .SH "DESCRIPTION"
diff --git a/man/ipsilon.conf.5 b/man/ipsilon.conf.5
index d9d7c4f..f79f064 100644
--- a/man/ipsilon.conf.5
+++ b/man/ipsilon.conf.5
@@ -1,6 +1,6 @@
 .\" Copyright (C) 2015 Ipsilon Project Contributors
 .\"
-.TH "ipsilon.conf" "5" "1.1.0" "Ipsilon" "Ipsilon Manual Pages"
+.TH "ipsilon.conf" "5" "1.2.0" "Ipsilon" "Ipsilon Manual Pages"
 .SH "NAME"
 ipsilon.conf \- Ipsilon IdP configuration file
 .SH "SYNOPSIS"
diff --git a/setup.py b/setup.py
index 7fc5f94..794af43 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ DATA = 'share/ipsilon/'
 
 setup(
     name = 'ipsilon',
-    version = '1.1.0',
+    version = '1.2.0',
     license = 'GPLv3+',
     maintainer = 'Ipsilon project Contributors',
     maintainer_email = 'ipsilon@lists.fedorahosted.org',