diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-17 15:07:45 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-17 15:07:45 -0400 |
| commit | b7e2699f5156607258ed0d500c5d6d6b92c35f26 (patch) | |
| tree | 24bde5be78c5d9920d21b3f79de06474ff3d282f /tools/export.py | |
| parent | 044213c789c4f1ee214da3d70f02352b1aaa8673 (diff) | |
| parent | 7e93fe741c17203fa63f60a7d1f66bfcdfb90d03 (diff) | |
| download | bcfg2-b7e2699f5156607258ed0d500c5d6d6b92c35f26.tar.gz bcfg2-b7e2699f5156607258ed0d500c5d6d6b92c35f26.tar.bz2 bcfg2-b7e2699f5156607258ed0d500c5d6d6b92c35f26.zip | |
Merge branch 'maint'
Conflicts:
doc/appendix/guides/centos.txt
doc/server/plugins/grouping/metadata.txt
setup.py
src/lib/Bcfg2/Client/Frame.py
src/lib/Bcfg2/Client/Proxy.py
src/lib/Bcfg2/Server/Lint/Genshi.py
src/lib/Bcfg2/Server/Lint/Validate.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
src/lib/Bcfg2/Server/Plugins/SSHbase.py
src/sbin/bcfg2-lint
Diffstat (limited to 'tools/export.py')
| -rwxr-xr-x | tools/export.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/export.py b/tools/export.py index 716c831d9..0f4724e6b 100755 --- a/tools/export.py +++ b/tools/export.py @@ -227,9 +227,6 @@ E.G. 1.2.0pre1 is a valid version. 'VERSION="%s"\n' % version, startswith=True, dryrun=options.dryrun) - # set new version in setup.py - find_and_replace('setup.py', 'version=', ' version="%s",\n' % version, - dryrun=options.dryrun) # set new version in Bcfg2/version.py find_and_replace('src/lib/Bcfg2/version.py', '__version__ =', |