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 /redhat | |
| 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 'redhat')
| -rw-r--r-- | redhat/VERSION | 2 | ||||
| -rw-r--r-- | redhat/bcfg2.spec.in | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/redhat/VERSION b/redhat/VERSION index 3a3cd8cc8..1892b9267 100644 --- a/redhat/VERSION +++ b/redhat/VERSION @@ -1 +1 @@ -1.3.1 +1.3.2 diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in index 5d0d54d08..0b16a0df1 100644 --- a/redhat/bcfg2.spec.in +++ b/redhat/bcfg2.spec.in @@ -256,6 +256,9 @@ fi %doc %{_defaultdocdir}/bcfg2-doc-%{version} %changelog +* Mon Jul 01 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.2-1 +- New upstream release + * Thu Mar 21 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.1-1 - New upstream release |