Merge branch 'erp5' into erp5-generic

95de18d7 · Łukasz Nowak · 4804a9f8 · ee0d1364 · 95de18d7 · 95de18d7
Commit 95de18d7 authored Dec 05, 2011 by Łukasz Nowak
Show 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.38 (Unreleased)
+0.39 (unreleased)
+-----------------
+
+ * No changes yet.
+
+0.38 (2011-12-05)
 -----------------

 * erp5: Swtich to percona, as maatkit is obsoleted. [Sebastien Robin]

--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os

-version = '0.38-dev'
+version = '0.39-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"