[puppet/epel7: 6/6] Merge branch 'master' into epel7

[Sam Kottler]

commit 51c1fc223650caa7b476fb8e88b5fbc72e9e1d6a
Merge: e62ed68 cb9ecce
Author: Sam Kottler <shk at linux.com>
Date:   Mon Apr 28 11:45:46 2014 -0400

    Merge branch 'master' into epel7
    
    * master:
      Update to 3.5.1
      RHBZ#1070395 - fixed error in postun scriplet
      Uploading fixed start-puppet-wrapper (typo) - correction
      Uploading fixed start-puppet-wrapper (typo)
      Activating wrapper scripts for systemd service files

 puppet.spec |   96 ++++++++++++++++++++++++++++++++++------------------------
 sources     |    6 ++--
 2 files changed, 59 insertions(+), 43 deletions(-)
---
diff --cc puppet.spec
index 69c3350,59baaae..e8ba773
--- a/puppet.spec
+++ b/puppet.spec
@@@ -17,9 -17,8 +17,9 @@@
  %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending
  
  Name:           puppet
- Version:        3.4.3
+ Version:        3.5.1
  Release:        1%{?dist}
 +Group:          System Environment/Base
  Summary:        A network tool for managing many disparate systems
  License:        ASL 2.0
  URL:            http://puppetlabs.com