From a3bb7ad2500b03057099b31fe97e354c4909d36f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 19 Mar 2011 03:10:18 +0100 Subject: [PATCH] cdist update --- software/cdist.mdwn | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/software/cdist.mdwn b/software/cdist.mdwn index dbf3d89a..cadb3e30 100644 --- a/software/cdist.mdwn +++ b/software/cdist.mdwn @@ -1,4 +1,4 @@ -[[!meta title="cdist - configuration management"]] +[[!meta title="cdist - usable configuration management"]] .. . .x+=:. s @@ -115,8 +115,12 @@ how to use cdist. There are at least the following branches available: * master: the development branch + * 1.2: Current stable: Dependencies supported + +Old versions: + * 1.0: First official release - * 1.1: Current stable (includes \_\_file type change) + * 1.1: __file to __file, __directory, __link migration Other branches may be available for features or bugfixes, but they may vanish at any point. To select a specific branch use @@ -125,7 +129,7 @@ may vanish at any point. To select a specific branch use git checkout -b origin/ # Stay on version 1.1 - git checkout -b 1.1 origin/1.1 + git checkout -b 1.2 origin/1.2 ### Mirrors @@ -146,6 +150,10 @@ If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break. The master branch on the other hand is the development branch and may not be working, break your setup or eat the tree in your garden. +### Upgrading from 1.1 to 1.2 + +No incompatiblities. + ### Upgrading from 1.0 to 1.1 In 1.1 the type **\_\_file** was split into **\_\_directory**, **\_\_file** and