Skip to content

Commit

Permalink
Merge branch '2.4.1-dev' into 2.4-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Randy Barlow committed Aug 26, 2014
2 parents 2babacc + 69b0c42 commit 0b5276a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion pulp-puppet.spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

Name: pulp-puppet
Version: 2.4.1
Release: 0.4.beta%{?dist}
Release: 0.5.rc1%{?dist}
Summary: Support for Puppet content in the Pulp platform
Group: Development/Languages
License: GPLv2
Expand Down Expand Up @@ -293,6 +293,9 @@ A collection of tools used to manage puppet modules.


%changelog
* Tue Aug 26 2014 Randy Barlow <[email protected]> 2.4.1-0.5.rc1
- Pulp rebuild

* Mon Aug 25 2014 Randy Barlow <[email protected]> 2.4.1-0.4.beta
- 1130312 - Add release notes for 2.4.1. ([email protected])

Expand Down
2 changes: 1 addition & 1 deletion rel-eng/packages/pulp-puppet
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.1-0.4.beta ./
2.4.1-0.5.rc1 ./

0 comments on commit 0b5276a

Please sign in to comment.