Merge remote branch 'nico/master'

This commit is contained in:
Steven Armstrong 2011-03-29 16:54:40 +02:00
commit 31132b42c6
3 changed files with 4 additions and 3 deletions

3
README
View file

@ -127,10 +127,11 @@ how to use cdist.
There are at least the following branches available: There are at least the following branches available:
* master: the development branch * master: the development branch
* 1.4: Support for redefiniton of objects (if equal) * 1.5: Focus on object orientation instead of global stage orientation
Old versions: Old versions:
* 1.4: Support for redefiniton of objects (if equal)
* 1.3: Support for local and remote code execution (current stable) * 1.3: Support for local and remote code execution (current stable)
* 1.2: Dependencies supported * 1.2: Dependencies supported
* 1.1: __file to __file, __directory, __link migration * 1.1: __file to __file, __directory, __link migration

View file

@ -19,7 +19,7 @@
# #
# #
__cdist_version="1.5.0pre" __cdist_version="1.5.0"
# Fail if something bogus is going on # Fail if something bogus is going on
set -u set -u

View file

@ -1,4 +1,4 @@
1.5.0: 1.5.0: 2011-03-29
* Add basic cache functionality * Add basic cache functionality
* New type __process * New type __process
* Restructured execution: (Steven Armstrong) * Restructured execution: (Steven Armstrong)