Skip to content

Commit

Permalink
#98 prepare 1.17.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
bdelbosc committed May 6, 2015
1 parent 606c963 commit b55f52c
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
12 changes: 11 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@ FunkLoad GIT master

:git: https://github.com/nuxeo/FunkLoad

:Target: 1.17.0
:Target: 1.17.1


FunkLoad 1.17.0
------------------

:Package: http://pypi.python.org/packages/source/f/funkload/funkload-1.17.0.tar.gz

:github: https://github.com/nuxeo/FunkLoad/tree/1.17.0

:Released date: 2015-05-06


New Features
Expand Down
5 changes: 0 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ sdist:
python setup.py $(PKGTAG) sdist

egg:
-python2.4 setup.py $(PKGTAG) bdist_egg
-python2.5 setup.py $(PKGTAG) bdist_egg
-python2.6 setup.py $(PKGTAG) bdist_egg
-python2.7 setup.py $(PKGTAG) bdist_egg

distrib:
Expand All @@ -38,9 +35,7 @@ install:
python setup.py $(PKGTAG) install

register:
-python2.6 setup.py register sdist bdist_egg upload
-python2.7 setup.py register bdist_egg upload
-python2.5 setup.py register bdist_egg upload


uninstall:
Expand Down
6 changes: 3 additions & 3 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@

# General information about the project.
project = u'FunkLoad'
copyright = u'2011, Benoit Delbosc'
copyright = u'2015, Benoit Delbosc'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '1.16'
version = '1.17'
# The full version, including alpha/beta/rc tags.
release = '1.16.1'
release = '1.17.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion doc/source/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ There are many ways:

[distribute]
log_path = log-distributed
funkload_location=http://pypi.python.org/packages/source/f/funkload/funkload-1.16.1.tar.gz
funkload_location=http://pypi.python.org/packages/source/f/funkload/funkload-1.17.0.tar.gz

You can have multiple benchers per server by defining many workers with
the same hostname in your configuration file. Add a workers section
Expand Down
2 changes: 1 addition & 1 deletion src/funkload/data/ConfigurationTestCase.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ sleep_time_max = 2
#
[distribute]
log_path = log-distributed
funkload_location=http://pypi.python.org/packages/source/f/funkload/funkload-1.16.1.tar.gz
funkload_location=http://pypi.python.org/packages/source/f/funkload/funkload-1.17.0.tar.gz
2 changes: 1 addition & 1 deletion src/funkload/demo/simple/Simple.conf
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@ sleep_time_max = 0.5
#
[distribute]
log_path = log-distributed
funkload_location=http://pypi.python.org/packages/source/f/funkload/funkload-1.16.1.tar.gz
funkload_location=http://pypi.python.org/packages/source/f/funkload/funkload-1.17.0.tar.gz

0 comments on commit b55f52c

Please sign in to comment.