diff options
| author | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
|---|---|---|
| committer | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
| commit | b848b5303c21c2dcb3d3c52e260944676864e332 (patch) | |
| tree | d1969c51a20a227b42ffb4c077ba1df79d784240 /setup.py | |
| parent | 9d0c43a54e4172061af2779336b821bb93fefc71 (diff) | |
| parent | 1186eae0c62ba6810ea597083bd8e56d487811c0 (diff) | |
| download | bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.gz bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.bz2 bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.zip | |
Merge branch 'master' into yumng
Conflicts:
src/lib/Client/Tools/YUMng.py
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -121,7 +121,7 @@ if sys.hexversion < 0x03000000 and os.path.exists(py3lib): setup(cmdclass=cmdclass, name="Bcfg2", - version="1.2.0pre2", + version="1.2.0pre3", description="Bcfg2 Server", author="Narayan Desai", author_email="desai@mcs.anl.gov", |