Merge branch 'master' into cmmi

5284491f · Łukasz Nowak · 2d7dc0b3 · f15bb155 · 5284491f · 5284491f
Commit 5284491f authored Sep 06, 2011 by Łukasz Nowak
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

CHANGES.txt CHANGES.txt +6 -1

setup.py setup.py +1 -1

No files found.
--- a/CHANGES.txt
+++ b/CHANGES.txt
 Changes
 =======

-0.4 (unreleased)
+0.5 (unreleased)
 ----------------

 * No changes yet.

+0.4 (2011-09-06)
+----------------
+
+ * Cmmi: Provide more features to control build process. [Łukasz Nowak]
+
 0.3 (2011-09-05)
 ----------------


--- a/setup.py
+++ b/setup.py
 from setuptools import setup, find_packages

-version = '0.4-dev'
+version = '0.5-dev'
 name = 'slapos.recipe.build'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"