Commit f4a9c608 authored by Rafael Monnerat's avatar Rafael Monnerat

Merge branch 'master' into '1.0'

Update development version

See merge request !15
parents 1ea59181 53403f41
...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages ...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '0.104.dev0' version = '1.0.9.dev0'
name = 'slapos.cookbook' name = 'slapos.cookbook'
long_description = open("README.txt").read() + "\n" + \ long_description = open("README.txt").read() + "\n" + \
open("CHANGES.txt").read() + "\n" open("CHANGES.txt").read() + "\n"
...@@ -225,4 +225,3 @@ setup(name=name, ...@@ -225,4 +225,3 @@ setup(name=name,
test_suite='slapos.test', test_suite='slapos.test',
tests_require=[ 'jsonschema' ], tests_require=[ 'jsonschema' ],
) )
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment