Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-01-04 17:17:58 -04:00
commit d0b0531918
1 changed files with 2 additions and 2 deletions

4
debian/changelog vendored
View File

@ -1,4 +1,4 @@
propellor (1.3.0) UNRELEASED; urgency=medium propellor (1.3.0) unstable; urgency=medium
* --spin checks if the DNS matches any configured IP address property * --spin checks if the DNS matches any configured IP address property
of the host, and if not, sshes to the host by IP address. of the host, and if not, sshes to the host by IP address.
@ -16,7 +16,7 @@ propellor (1.3.0) UNRELEASED; urgency=medium
* CloudAtCost.deCruft no longer forces randomHostKeys. * CloudAtCost.deCruft no longer forces randomHostKeys.
* Fix build with process 1.2.1.0. * Fix build with process 1.2.1.0.
-- Joey Hess <id@joeyh.name> Thu, 01 Jan 2015 13:27:23 -0400 -- Joey Hess <id@joeyh.name> Sun, 04 Jan 2015 17:17:44 -0400
propellor (1.2.2) unstable; urgency=medium propellor (1.2.2) unstable; urgency=medium