summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-09-22 19:35:24 -0400
committerJoey Hess2015-09-22 19:35:24 -0400
commit3a6e069f1c221dfe77e771fb39c0ed267b98f056 (patch)
tree659712ac4407c522d0e34b29e49e3fb0c96a7810
parentee3058a5b73f2a651ba0d28110cf81845f888094 (diff)
parent5b476d10d5be59fadc5646858c552d017fb1b34e (diff)
Merge branch 'joeyconfig'
-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 c5a42e49..ff634ad6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (2.8.0) UNRELEASED; urgency=medium
+propellor (2.8.0) unstable; urgency=medium
* Added Propellor.Property.Rsync.
* Convert Info to use Data.Dynamic, so properties can export and consume
@@ -27,7 +27,7 @@ propellor (2.8.0) UNRELEASED; urgency=medium
privDataByteString.
* Added Aiccu module, contributed by Jelmer Vernooij.
- -- Joey Hess <id@joeyh.name> Fri, 04 Sep 2015 10:36:40 -0700
+ -- Joey Hess <id@joeyh.name> Tue, 22 Sep 2015 19:35:07 -0400
propellor (2.7.3) unstable; urgency=medium
diff --git a/propellor.cabal b/propellor.cabal
index b42f6859..f111174c 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 2.7.3
+Version: 2.8.0
Cabal-Version: >= 1.8
License: BSD3
Maintainer: Joey Hess <id@joeyh.name>