summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-04-25 11:21:13 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-04-25 11:21:13 -0500
commit3598405308c007d5e2edbb4d51c66def6187a468 (patch)
tree26912b8d26a08fd9b143c15e1ff77204e3b40212
parent39fed8496bd7303c85403ba0c7507172eb1d7322 (diff)
downloadbcfg2-3598405308c007d5e2edbb4d51c66def6187a468.tar.gz
bcfg2-3598405308c007d5e2edbb4d51c66def6187a468.tar.bz2
bcfg2-3598405308c007d5e2edbb4d51c66def6187a468.zip
Version bump to 1.2.0pre2v1.2.0pre2
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--debian/changelog6
-rw-r--r--misc/bcfg2.spec2
-rw-r--r--redhat/RELEASE2
-rw-r--r--setup.py2
-rw-r--r--solaris/Makefile2
-rw-r--r--solaris/pkginfo.bcfg22
-rw-r--r--solaris/pkginfo.bcfg2-server2
-rw-r--r--src/lib/Server/Reports/reports/templates/base.html2
8 files changed, 13 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 61ea813b7..01e4478d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.2.0-0.0pre2) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com> Mon, 25 Apr 2011 11:21:13 -0500
+
bcfg2 (1.2.0-0.0pre1) unstable; urgency=low
* New upstream release
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 727b7bc72..1e6b71ea5 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -13,7 +13,7 @@
%define lxmldep %(rpm -q %{alt_lxml} 2>&1 > /dev/null && echo %{alt_lxml} || echo %{dfl_lxml})
Name: bcfg2
-Version: 1.2.0pre1
+Version: 1.2.0pre2
Release: %{release}
Summary: Configuration management system
diff --git a/redhat/RELEASE b/redhat/RELEASE
index 22a4ba1bd..a0694f914 100644
--- a/redhat/RELEASE
+++ b/redhat/RELEASE
@@ -1 +1 @@
-0.0pre1
+0.0pre2
diff --git a/setup.py b/setup.py
index 9dc3ea2f3..52ec93d10 100644
--- a/setup.py
+++ b/setup.py
@@ -115,7 +115,7 @@ except ImportError:
setup(cmdclass=cmdclass,
name="Bcfg2",
- version="1.2.0pre1",
+ version="1.2.0pre2",
description="Bcfg2 Server",
author="Narayan Desai",
author_email="desai@mcs.anl.gov",
diff --git a/solaris/Makefile b/solaris/Makefile
index bd3d097d4..65ab6309e 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,7 +1,7 @@
#!/usr/sfw/bin/gmake
PYTHON="/opt/csw/bin/python"
-VERS=1.2.0pre1-1
+VERS=1.2.0pre2-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 8eeb29f62..cd8215741 100644
--- a/solaris/pkginfo.bcfg2
+++ b/solaris/pkginfo.bcfg2
@@ -1,7 +1,7 @@
PKG="SCbcfg2"
NAME="bcfg2"
ARCH="sparc"
-VERSION="1.2.0pre1"
+VERSION="1.2.0pre2"
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 031d2a385..8bc069d08 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.0pre1"
+VERSION="1.2.0pre2"
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 a64f1c76a..6ef4c9aff 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.0pre1</span>
+ <span>Bcfg2 Version 1.2.0pre2</span>
</div>
<div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div>