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

[Sam Kottler]

commit ee46ed952a19bac05a0efe7bcec7811a6ce60744
Merge: ea429ed 773d1a3
Author: Sam Kottler <shk at linux.com>
Date:   Sun May 18 13:18:47 2014 -0400

    Merge branch 'master' into epel7
    
    * master:
      Remove superfluous logic and update to 3.6.0

 puppet.spec |   12 ++++++++----
 sources     |    6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --cc puppet.spec
index d2ff127,f28e661..bdd7f1f
--- a/puppet.spec
+++ b/puppet.spec
@@@ -17,9 -15,8 +15,9 @@@
  %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending
  
  Name:           puppet
- Version:        3.5.1
+ Version:        3.6.0
  Release:        1%{?dist}
 +Group:          System Environment/Base
  Summary:        A network tool for managing many disparate systems
  License:        ASL 2.0
  URL:            http://puppetlabs.com