summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-07-30 12:10:58 -0400
committerJoey Hess2015-07-30 12:10:58 -0400
commit37cf983363d5acaa8530d4b93e7221de04bea6f1 (patch)
treec67280cedaf636fcea8cc50871646fb348f40c62 /debian
parentf17020cb7fa2b2967b96afc10a2cd82de8a977cc (diff)
parent6fe4b0cd9174aad50987a41784f2e63cf8f1ddd1 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f4fcf35c..2decb1f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (2.7.0) UNRELEASED; urgency=medium
+propellor (2.7.0) unstable; urgency=medium
* Ssh.permitRootLogin type changed to allow configuring WithoutPassword
and ForcedCommandsOnly (API change)
@@ -8,8 +8,11 @@ propellor (2.7.0) UNRELEASED; urgency=medium
* Added onChangeFlagOnFail which is often a safer alternative to
onChange.
Thanks, Antoine Eiche.
+ * Work around broken git pull option parser in git 2.5.0,
+ which broke use of --upload-pack to send a git push when running
+ propellor --spin.
- -- Joey Hess <id@joeyh.name> Mon, 20 Jul 2015 12:01:38 -0400
+ -- Joey Hess <id@joeyh.name> Thu, 30 Jul 2015 12:05:46 -0400
propellor (2.6.0) unstable; urgency=medium