Commit d70e039b authored by Chris Snijder's avatar Chris Snijder 🏅
Browse files

Make a new version and update the changelog.

parent 094e1938
Pipeline #5522 passed with stages
in 6 minutes and 6 seconds
stapled (1.1) stretch; urgency=low
* Change haproxy socket connection timeout to new default: 3600 seconds.
* Add --haproxy-socket-timeout command line argument.
-- Chris <chris@greenhost.nl> Mon, 22 Oct 2018 18:34:15 +0200
stapled (1.0) stretch; urgency=low
* This version removes support for debian Jessie due to the shutdown of
......
__version__ = '1.0'
__version__ = '1.1'
__app_name__ = 'stapled'
__debian_version__ = 'stretch'
......@@ -286,7 +286,7 @@ class GitVersion(object):
# Take index 7: to strip off 'commit '
commit_hash = str(
subprocess.check_output(
['git', 'log', '-n', '1', self.file],
['git', 'log', '--decorate=', '-n', '1', self.file],
universal_newlines=True
)
).split('\n')[0][len('commit '):]
......@@ -453,7 +453,7 @@ def main():
default='stapled/version.py',
const='stapled/version.py',
help=(
'Save the new number to the a file named .version, optionally pass'
'Save the new number to the version file, optionally pass'
'a different filename to the argument.'
)
)
......
Supports Markdown
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