diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2015-06-11 15:30:04 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2015-06-11 15:30:04 -0500 |
commit | ee11ee47bf86b67db100d76932a912d8239fa9d9 (patch) | |
tree | 8628cebfafae1b0b5a9a13b64dfd225f62bdedc1 | |
parent | a8953fd3cc3c8587eade52f0c3362da833014f32 (diff) | |
download | bcfg2-ee11ee47bf86b67db100d76932a912d8239fa9d9.tar.gz bcfg2-ee11ee47bf86b67db100d76932a912d8239fa9d9.tar.bz2 bcfg2-ee11ee47bf86b67db100d76932a912d8239fa9d9.zip |
Version bump to 1.3.6
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | doc/conf.py | 2 | ||||
-rw-r--r-- | misc/bcfg2-selinux.spec | 2 | ||||
-rw-r--r-- | misc/bcfg2.spec | 2 | ||||
-rw-r--r-- | osx/Makefile | 4 | ||||
-rw-r--r-- | osx/macports/Portfile | 2 | ||||
-rw-r--r-- | solaris-ips/MANIFEST.bcfg2-server.header | 2 | ||||
-rw-r--r-- | solaris-ips/MANIFEST.bcfg2.header | 2 | ||||
-rw-r--r-- | solaris-ips/Makefile | 2 | ||||
-rw-r--r-- | solaris-ips/pkginfo.bcfg2 | 2 | ||||
-rw-r--r-- | solaris-ips/pkginfo.bcfg2-server | 2 | ||||
-rw-r--r-- | solaris/Makefile | 2 | ||||
-rw-r--r-- | solaris/pkginfo.bcfg2 | 2 | ||||
-rw-r--r-- | solaris/pkginfo.bcfg2-server | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Reporting/templates/base.html | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/version.py | 2 |
16 files changed, 22 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index 3879cc50a..492495c77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bcfg2 (1.3.6-0.0) unstable; urgency=low + + * New upstream release + + -- Sol Jerome <sol.jerome@gmail.com> Thu, 11 Jun 2015 15:30:04 -0500 + bcfg2 (1.3.5-0.0) unstable; urgency=low * New upstream release diff --git a/doc/conf.py b/doc/conf.py index 3e877ef80..0d1188c39 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -66,7 +66,7 @@ else: # The short X.Y version. version = '1.3' # The full version, including alpha/beta/rc tags. -release = '1.3.5' +release = '1.3.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec index c926a1d74..fe9608ed0 100644 --- a/misc/bcfg2-selinux.spec +++ b/misc/bcfg2-selinux.spec @@ -16,7 +16,7 @@ %global _pre_rc %{?_pre:.pre%{_pre}}%{?_rc:.rc%{_rc}} Name: bcfg2-selinux -Version: 1.3.5 +Version: 1.3.6 Release: 1%{?_pre_rc}%{?dist} Summary: Bcfg2 Client and Server SELinux policy diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index c2d3c3c90..aa97c8d20 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -29,7 +29,7 @@ Name: bcfg2 -Version: 1.3.5 +Version: 1.3.6 Release: 1%{?_pre_rc}%{?dist} Summary: A configuration management system diff --git a/osx/Makefile b/osx/Makefile index ee7b7d565..9fa9e56ce 100644 --- a/osx/Makefile +++ b/osx/Makefile @@ -29,9 +29,9 @@ SITELIBDIR = /Library/Python/${PYVERSION}/site-packages # an Info.plist file for packagemaker to look at for package creation # and substitute the version strings. Major/Minor versions can only be # integers (e.g. "1" and "00" for bcfg2 version 1.0.0. -BCFGVER = 1.3.5 +BCFGVER = 1.3.6 MAJOR = 1 -MINOR = 35 +MINOR = 36 default: clean client diff --git a/osx/macports/Portfile b/osx/macports/Portfile index cf6f33ddc..dbf0bb901 100644 --- a/osx/macports/Portfile +++ b/osx/macports/Portfile @@ -5,7 +5,7 @@ PortSystem 1.0 PortGroup python26 1.0 name bcfg2 -version 1.3.5 +version 1.3.6 categories sysutils python maintainers gmail.com:sol.jerome license BSD diff --git a/solaris-ips/MANIFEST.bcfg2-server.header b/solaris-ips/MANIFEST.bcfg2-server.header index 9e6774c87..a7a451707 100644 --- a/solaris-ips/MANIFEST.bcfg2-server.header +++ b/solaris-ips/MANIFEST.bcfg2-server.header @@ -1,4 +1,4 @@ license ../../LICENSE license=simplified_bsd set name=description value="Configuration management server" set name=pkg.summary value="Configuration management server" -set name=pkg.fmri value="pkg://bcfg2/bcfg2-server@1.3.5" +set name=pkg.fmri value="pkg://bcfg2/bcfg2-server@1.3.6" diff --git a/solaris-ips/MANIFEST.bcfg2.header b/solaris-ips/MANIFEST.bcfg2.header index 97c63107e..0f2fc42b8 100644 --- a/solaris-ips/MANIFEST.bcfg2.header +++ b/solaris-ips/MANIFEST.bcfg2.header @@ -1,5 +1,5 @@ license ../../LICENSE license=simplified_bsd set name=description value="Configuration management client" set name=pkg.summary value="Configuration management client" -set name=pkg.fmri value="pkg://bcfg2/bcfg2@1.3.5" +set name=pkg.fmri value="pkg://bcfg2/bcfg2@1.3.6" file usr/bin/bcfg2 group=bin mode=0755 owner=root path=usr/bin/bcfg2 diff --git a/solaris-ips/Makefile b/solaris-ips/Makefile index ec85dccc2..0320d9da3 100644 --- a/solaris-ips/Makefile +++ b/solaris-ips/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/gmake -VERS=1.3.5-1 +VERS=1.3.6-1 PYVERSION := $(shell python -c "import sys; print sys.version[0:3]") default: clean package diff --git a/solaris-ips/pkginfo.bcfg2 b/solaris-ips/pkginfo.bcfg2 index 57ffaffb8..7fa7e1c65 100644 --- a/solaris-ips/pkginfo.bcfg2 +++ b/solaris-ips/pkginfo.bcfg2 @@ -1,7 +1,7 @@ PKG="SCbcfg2" NAME="bcfg2" ARCH="sparc" -VERSION="1.3.5" +VERSION="1.3.6" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" diff --git a/solaris-ips/pkginfo.bcfg2-server b/solaris-ips/pkginfo.bcfg2-server index 50812c4a5..2ef50951d 100644 --- a/solaris-ips/pkginfo.bcfg2-server +++ b/solaris-ips/pkginfo.bcfg2-server @@ -1,7 +1,7 @@ PKG="SCbcfg2-server" NAME="bcfg2-server" ARCH="sparc" -VERSION="1.3.5" +VERSION="1.3.6" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" diff --git a/solaris/Makefile b/solaris/Makefile index 7719d7017..a1369e85c 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -1,7 +1,7 @@ #!/usr/sfw/bin/gmake PYTHON="/usr/local/bin/python" -VERS=1.3.5-1 +VERS=1.3.6-1 export PYVERSION := $(shell $(PYTHON) -c "import sys; print sys.version[0:3]") default: clean package diff --git a/solaris/pkginfo.bcfg2 b/solaris/pkginfo.bcfg2 index 57ffaffb8..7fa7e1c65 100644 --- a/solaris/pkginfo.bcfg2 +++ b/solaris/pkginfo.bcfg2 @@ -1,7 +1,7 @@ PKG="SCbcfg2" NAME="bcfg2" ARCH="sparc" -VERSION="1.3.5" +VERSION="1.3.6" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" diff --git a/solaris/pkginfo.bcfg2-server b/solaris/pkginfo.bcfg2-server index 50812c4a5..2ef50951d 100644 --- a/solaris/pkginfo.bcfg2-server +++ b/solaris/pkginfo.bcfg2-server @@ -1,7 +1,7 @@ PKG="SCbcfg2-server" NAME="bcfg2-server" ARCH="sparc" -VERSION="1.3.5" +VERSION="1.3.6" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" diff --git a/src/lib/Bcfg2/Reporting/templates/base.html b/src/lib/Bcfg2/Reporting/templates/base.html index a367d8ccb..7589f404e 100644 --- a/src/lib/Bcfg2/Reporting/templates/base.html +++ b/src/lib/Bcfg2/Reporting/templates/base.html @@ -93,7 +93,7 @@ This is needed for Django versions less than 1.5 <div style='clear:both'></div> </div><!-- document --> <div id="footer"> - <span>Bcfg2 Version 1.3.5</span> + <span>Bcfg2 Version 1.3.6</span> </div> <div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div> diff --git a/src/lib/Bcfg2/version.py b/src/lib/Bcfg2/version.py index 61ba7a405..dfacfce6b 100644 --- a/src/lib/Bcfg2/version.py +++ b/src/lib/Bcfg2/version.py @@ -2,7 +2,7 @@ import re -__version__ = "1.3.5" +__version__ = "1.3.6" class Bcfg2VersionInfo(tuple): # pylint: disable=E0012,R0924 |