diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-11 15:46:09 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-11 15:46:09 -0500 |
| commit | e30c785c94c5aa399c44fff386fa2279f64f1acc (patch) | |
| tree | e72c636dcae00a6ea0c668cfbee7d3e6b4e6a3fe /osx | |
| parent | 7aa15c4c5507e311ff66264bc31e6758a80eb337 (diff) | |
| parent | 103b1b5198828876fa0684296900769018075f1b (diff) | |
| download | bcfg2-e30c785c94c5aa399c44fff386fa2279f64f1acc.tar.gz bcfg2-e30c785c94c5aa399c44fff386fa2279f64f1acc.tar.bz2 bcfg2-e30c785c94c5aa399c44fff386fa2279f64f1acc.zip | |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/Server/Admin/Compare.py
src/lib/Bcfg2/Server/Admin/Snapshots.py
src/lib/Bcfg2/Server/MultiprocessingCore.py
src/lib/Bcfg2/Server/Plugins/Probes.py
src/sbin/bcfg2-crypt
src/sbin/bcfg2-reports
tools/upgrade/1.3/migrate_configs.py
tools/upgrade/1.3/migrate_perms_to_mode.py
Diffstat (limited to 'osx')
| -rw-r--r-- | osx/Makefile | 4 | ||||
| -rw-r--r-- | osx/macports/Portfile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/osx/Makefile b/osx/Makefile index d6c63e249..7714fa4d8 100644 --- a/osx/Makefile +++ b/osx/Makefile @@ -28,9 +28,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.2 +BCFGVER = 1.3.3 MAJOR = 1 -MINOR = 32 +MINOR = 33 default: clean client diff --git a/osx/macports/Portfile b/osx/macports/Portfile index 11c1d1908..83c7f4075 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.2 +version 1.3.3 categories sysutils python maintainers gmail.com:sol.jerome license BSD |