Merge remote-tracking branch 'telmich/master'

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2015-06-01 10:31:53 +02:00
commit 6c47dfbd54
28 changed files with 222 additions and 97 deletions

View file

@ -7,6 +7,7 @@ next:
* New type: __pacman_conf_integrate: cdist compatible pacman.conf (Dominique Roux)
* Type __consul: Do not install unused package unzip (Steven Armstrong)
* Type __consul: Add source & cksum for 0.5.2 (Steven Armstrong)
* Core: Support object ids '.cdist' (Nico Schottelius)
3.1.13: 2015-05-16