Merge remote branch 'nico/master'

remotes/origin/1.5
Steven Armstrong 14 years ago
commit 31132b42c6
  1. 3
      README
  2. 2
      bin/cdist-config
  3. 2
      doc/changelog

@ -127,10 +127,11 @@ how to use cdist.
There are at least the following branches available:
* 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:
* 1.4: Support for redefiniton of objects (if equal)
* 1.3: Support for local and remote code execution (current stable)
* 1.2: Dependencies supported
* 1.1: __file to __file, __directory, __link migration

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

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

Loading…
Cancel
Save