Merge pull request puppetlabs#3 from mhaskel/rhel7

'!' binds before 'and'.

Author: Ashley Penney

manifests/globals.pp

@@ -104,7 +104,7 @@
   # Setup of the repo only makes sense globally, so we are doing this here.
   if($manage_package_repo) {
     # Workaround the lack of RHEL7 repositories for now.
-    if ! ($::operatingsystem == 'RedHat') and ($::operatingsystemrelease =~ /^7/) {
+    if ! ($::operatingsystem == 'RedHat' and $::operatingsystemrelease =~ /^7/) {
       class { 'postgresql::repo':
         ensure  => $ensure,
         version => $globals_version