diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-08 16:29:33 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-08 16:29:33 -0500 |
| commit | f24ee0bb658d2102c731960a78478687c22cc517 (patch) | |
| tree | d9825dcc873f7adcdf615a96ab8f67881265a595 /solaris | |
| parent | 8bc0d778d5792e89451bd986831ca4ea10bfa39b (diff) | |
| parent | a0f20bdde06ccb7be85f59e1b8fbf57e1c492e64 (diff) | |
| download | bcfg2-f24ee0bb658d2102c731960a78478687c22cc517.tar.gz bcfg2-f24ee0bb658d2102c731960a78478687c22cc517.tar.bz2 bcfg2-f24ee0bb658d2102c731960a78478687c22cc517.zip | |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/settings.py
src/sbin/bcfg2-crypt
Diffstat (limited to 'solaris')
| -rw-r--r-- | solaris/Makefile | 2 | ||||
| -rw-r--r-- | solaris/pkginfo.bcfg2 | 2 | ||||
| -rw-r--r-- | solaris/pkginfo.bcfg2-server | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/solaris/Makefile b/solaris/Makefile index fd2c254bb..e0c005f88 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -1,7 +1,7 @@ #!/usr/sfw/bin/gmake PYTHON="/usr/local/bin/python" -VERS=1.3.1-1 +VERS=1.3.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 2bf3abaf5..47fc96244 100644 --- a/solaris/pkginfo.bcfg2 +++ b/solaris/pkginfo.bcfg2 @@ -1,7 +1,7 @@ PKG="SCbcfg2" NAME="bcfg2" ARCH="sparc" -VERSION="1.3.1" +VERSION="1.3.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 4425220c2..c9dd0c45b 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.1" +VERSION="1.3.2" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" |