summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-06-16 14:53:08 -0400
committerJoey Hess2015-06-16 14:53:08 -0400
commitd353db60ad3a712d691832a67d40248b26a53e68 (patch)
tree7dce0ccf6bb88bd4147230a88b13cef365580144 /debian
parentb55ea3c29560bafced4b191393410177ba862327 (diff)
parent948f855c63d6f2da09ce3689d1b610b343501f73 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6e641881..079ecf48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+propellor (2.6.0) UNRELEASED; 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)
+ Thanks, Antoine Eiche.
+
+ -- Joey Hess <id@joeyh.name> Tue, 16 Jun 2015 14:49:12 -0400
+
propellor (2.5.0) unstable; urgency=medium
* cmdProperty' renamed to cmdPropertyEnv to make way for a new,