diff --git a/bin/pungi b/bin/pungi index c98fc555..f22120f1 100755 --- a/bin/pungi +++ b/bin/pungi @@ -200,7 +200,7 @@ if __name__ == '__main__': today = time.strftime('%Y%m%d', time.localtime()) def get_arguments(config): - parser = OptionParser("%prog [--help] [options]", version="%prog 4.1.5") + parser = OptionParser("%prog [--help] [options]", version="%prog 4.1.6") def set_config(option, opt_str, value, parser, config): config.set('pungi', option.dest, value) diff --git a/doc/conf.py b/doc/conf.py index 22ae2300..0e0d19ae 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -53,7 +53,7 @@ copyright = u'2016, Red Hat, Inc.' # The short X.Y version. version = '4.1' # The full version, including alpha/beta/rc tags. -release = '4.1.5' +release = '4.1.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pungi.spec b/pungi.spec index 2e44f2d8..9507d655 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,5 +1,5 @@ Name: pungi -Version: 4.1.5 +Version: 4.1.6 Release: 1%{?dist} Summary: Distribution compose tool @@ -72,6 +72,14 @@ nosetests --exe --with-cov --cov-report html --cov-config tox.ini cd tests && ./test_compose.sh %changelog +* Tue May 24 2016 Dennis Gilmore - 4.1.6-1 +- [ostree-installer] Allow using external repos as source (lsedlar) +- [image-build] Allow using external install trees (lsedlar) +- Add type to base product for layered releases (lsedlar) +- Merge #303 `[ostree] Use unique work and log paths` (dennis) +- [ostree] Use unique work and log paths (lsedlar) +- [arch] Add mock rpmUtils module (lsedlar) + * Mon May 16 2016 Dennis Gilmore - 4.1.5-1 - [ostree] Put variant name in ostree log dir (lsedlar) - Merge #294 `[ostree] Initialize empty repo` (dennis) diff --git a/setup.py b/setup.py index 0d30ea03..0c712573 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ packages = sorted(packages) setup( name = "pungi", - version = "4.1.5", # make sure it matches with pungi.__version__ + version = "4.1.6", # make sure it matches with pungi.__version__ description = "Distribution compose tool", url = "https://pagure.io/pungi", author = "Dennis Gilmore",