diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | misc/bcfg2.spec | 6 | ||||
| -rw-r--r-- | osx/Makefile | 4 | ||||
| -rw-r--r-- | redhat/VERSION | 2 | ||||
| -rwxr-xr-x | setup.py | 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/Server/Reports/reports/templates/base.html | 2 |
10 files changed, 18 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 5722eeb97..2557dd66a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bcfg2 (1.2.2-0.0) unstable; urgency=low + + * New upstream release + + -- Sol Jerome <sol.jerome@gmail.com> Sat, 17 Mar 2012 14:41:17 -0500 + bcfg2 (1.2.1-0.0) unstable; urgency=low * New upstream release diff --git a/doc/conf.py b/doc/conf.py index 7e9c8b59c..38160715d 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -55,7 +55,7 @@ else: # The short X.Y version. version = '1.2' # The full version, including alpha/beta/rc tags. -release = '1.2.1' +release = '1.2.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 0c726bed0..9fa119edf 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -6,7 +6,7 @@ %{!?_initrddir: %define _initrddir %{_sysconfdir}/rc.d/init.d} Name: bcfg2 -Version: 1.2.1 +Version: 1.2.2 Release: %{release} Summary: Configuration management system @@ -91,7 +91,7 @@ deployment strategies. This package includes the Bcfg2 client software. %package -n bcfg2-server -Version: %{version} +Version: 1.2.2 Summary: Bcfg2 Server %if 0%{?suse_version} Group: System/Management @@ -172,7 +172,7 @@ deployment strategies. This package includes the Bcfg2 documentation. %package -n bcfg2-web -Version: %{version} +Version: 1.2.2 Summary: Bcfg2 Web Reporting Interface %if 0%{?suse_version} Group: System/Management diff --git a/osx/Makefile b/osx/Makefile index 279ad0f6f..72751ff32 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.2.1 +BCFGVER = 1.2.2 MAJOR = 1 -MINOR = 21 +MINOR = 22 default: clean client diff --git a/redhat/VERSION b/redhat/VERSION index 6085e9465..23aa83906 100644 --- a/redhat/VERSION +++ b/redhat/VERSION @@ -1 +1 @@ -1.2.1 +1.2.2 @@ -121,7 +121,7 @@ if sys.hexversion < 0x03000000 and os.path.exists(py3lib): setup(cmdclass=cmdclass, name="Bcfg2", - version="1.2.1", + version="1.2.2", description="Bcfg2 Server", author="Narayan Desai", author_email="desai@mcs.anl.gov", diff --git a/solaris/Makefile b/solaris/Makefile index ba12b865b..77d9019eb 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -1,7 +1,7 @@ #!/usr/sfw/bin/gmake PYTHON="/usr/local/bin/python" -VERS=1.2.1-1 +VERS=1.2.2-1 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 c4633f209..0ff18516d 100644 --- a/solaris/pkginfo.bcfg2 +++ b/solaris/pkginfo.bcfg2 @@ -1,7 +1,7 @@ PKG="SCbcfg2" NAME="bcfg2" ARCH="sparc" -VERSION="1.2.1" +VERSION="1.2.2" 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 762625967..a0958f9e4 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.2.1" +VERSION="1.2.2" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" diff --git a/src/lib/Server/Reports/reports/templates/base.html b/src/lib/Server/Reports/reports/templates/base.html index a12bf66ba..f541c0d2b 100644 --- a/src/lib/Server/Reports/reports/templates/base.html +++ b/src/lib/Server/Reports/reports/templates/base.html @@ -87,7 +87,7 @@ <div style='clear:both'></div> </div><!-- document --> <div id="footer"> - <span>Bcfg2 Version 1.2.1</span> + <span>Bcfg2 Version 1.2.2</span> </div> <div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div> |