summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-06-09 17:09:09 -0400
committerJoey Hess2015-06-09 17:09:09 -0400
commit723f47d1ac6ebaddbe8df112a4b12ce7520dc89a (patch)
tree76c314d8d1746b792c083337b3dbe7a55eefdb9f /debian
parentfd83259d8c636ac23478555a9ddbfa4e95fdf416 (diff)
parent9415bfb4adb61dedfc1301ff0bc7310cec40455a (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
1 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f4459a2c..2441f4ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (2.5.0) UNRELEASED; urgency=medium
+propellor (2.5.0) unstable; urgency=medium
* cmdProperty' renamed to cmdPropertyEnv to make way for a new,
more generic cmdProperty' (API change)
@@ -24,8 +24,10 @@ propellor (2.5.0) UNRELEASED; urgency=medium
* Docker: volume and publish accept Bound FilePath and Bound Port,
respectively. They also continue to accept Strings, for backwards
compatability.
+ * Docker: Added environment property.
+ Thanks Antoine Eiche.
- -- Joey Hess <id@joeyh.name> Thu, 07 May 2015 12:08:34 -0400
+ -- Joey Hess <id@joeyh.name> Tue, 09 Jun 2015 17:08:43 -0400
propellor (2.4.0) unstable; urgency=medium