summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-07-10 22:36:59 -0400
committerJoey Hess2015-07-10 22:36:59 -0400
commit8946b47db61d4debebe3a64637b4dbaa1d2c39f6 (patch)
treeca58bdce43c8c6db031cdae8b014aca40127e256
parent6d511cfba30db4a7852552f937d4693270c15d54 (diff)
prep release
-rw-r--r--debian/changelog4
-rw-r--r--propellor.cabal2
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 4cb94403..3b20a402 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (2.6.0) UNRELEASED; urgency=medium
+propellor (2.6.0) unstable; urgency=medium
* Replace String type synonym Docker.Image by a data type
which allows to specify an image name and an optional tag. (API change)
@@ -9,7 +9,7 @@ propellor (2.6.0) UNRELEASED; urgency=medium
Thanks, Sean Whitton
* Fix make install target to work even when git is not configured.
- -- Joey Hess <id@joeyh.name> Tue, 16 Jun 2015 14:49:12 -0400
+ -- Joey Hess <id@joeyh.name> Fri, 10 Jul 2015 22:36:29 -0400
propellor (2.5.0) unstable; urgency=medium
diff --git a/propellor.cabal b/propellor.cabal
index ad9f4530..1c6664b2 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 2.5.0
+Version: 2.6.0
Cabal-Version: >= 1.6
License: BSD3
Maintainer: Joey Hess <id@joeyh.name>