summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-01-25 15:16:58 -0400
committerJoey Hess2015-01-25 15:16:58 -0400
commit401b857eef13ca7d3f7b8f6b88e9237884fcd906 (patch)
treeeb4b5c189349b5a86b3b39edbe039956d3a1a3b8 /debian
parent1df70ba81ddfbd4ceeb5344793f7714a35706c8f (diff)
parentcdd88b080af534231aae8a64ef327f0597a5b5b3 (diff)
Merge branch 'joeyconfig'
Conflicts: doc/todo/info_propigation_out_of_nested_properties.mdwn privdata.joey/privdata.gpg
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog28
-rw-r--r--debian/control2
2 files changed, 29 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 44335711..abf6bd16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+propellor (2.0.0) UNRELEASED; urgency=medium
+
+ * Property has been converted to a GADT, and will be Property NoInfo
+ or Property HasInfo.
+ This was done to make sure that ensureProperty is only used on
+ properties that do not have Info.
+ Transition guide:
+ - Change all "Property" to "Property NoInfo" or "Property WithInfo"
+ (The compiler can tell you if you got it wrong!)
+ - To construct a RevertableProperty, it is useful to use the new
+ (<!>) operator
+ - Constructing a list of properties can be problimatic, since
+ Property NoInto and Property WithInfo are different types and cannot
+ appear in the same list. To deal with this, "props" has been added,
+ and can built up a list of properties of different types,
+ using the same (&) and (!) operators that are used to build
+ up a host's properties.
+ * Add descriptions of how to set missing fields to --list-fields output.
+ * Properties now form a tree, instead of the flat list used before.
+ This includes the properties used inside a container.
+ * Fix info propigation from fallback combinator's second Property.
+ * Added systemd configuration properties.
+ * Added journald configuration properties.
+ * Added more network interface configuration properties.
+ * Implemented OS.preserveNetwork.
+
+ -- Joey Hess <id@joeyh.name> Thu, 15 Jan 2015 20:14:29 -0400
+
propellor (1.3.2) unstable; urgency=medium
* SSHFP records are also generated for CNAMES of hosts.
diff --git a/debian/control b/debian/control
index 24ff39cb..a9b6c2ce 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
libghc-monadcatchio-transformers-dev,
Maintainer: Gergely Nagy <algernon@madhouse-project.org>
Standards-Version: 3.9.6
-Vcs-Git: git://git.kitenet.net/propellor
+Vcs-Git: git://git.joeyh.name/propellor
Homepage: http://propellor.branchable.com/
Package: propellor