Merge remote-tracking branch 'upstream/stable'

* upstream/stable:
  (PUP-4340) Fix intermittent failure in test case
  Merge pull request #3742 from joshcooper/ticket/master/PUP-4194-relocate-puppet-logdir
  (PUP-3290) Update hiera version to 2.0 under ext
  (PUP-3920) Make puppet depend on hiera 2.0

Author: joshcooper

.gemspec

@@ -43,13 +43,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<facter>, [">= 1.7", "< 3"])
-      s.add_runtime_dependency(%q<hiera>, [">= 1.0", "< 3"])
+      s.add_runtime_dependency(%q<hiera>, [">= 2.0", "< 3"])
     else
       s.add_dependency(%q<facter>, [">= 1.7", "< 3"])
-      s.add_dependency(%q<hiera>, [">= 1.0", "< 3"])
+      s.add_dependency(%q<hiera>, [">= 2.0", "< 3"])
     end
   else
     s.add_dependency(%q<facter>, [">= 1.7", "< 3"])
-    s.add_dependency(%q<hiera>, [">= 1.0", "< 3"])
+    s.add_dependency(%q<hiera>, [">= 2.0", "< 3"])
   end
 end

Gemfile

@@ -25,7 +25,7 @@ end
 
 gem "puppet", :path => File.dirname(__FILE__), :require => false
 gem "facter", *location_for(ENV['FACTER_LOCATION'] || ['> 2.0', '< 4'])
-gem "hiera", *location_for(ENV['HIERA_LOCATION'] || ['> 1.0', '< 3'])
+gem "hiera", *location_for(ENV['HIERA_LOCATION'] || ['>= 2.0', '< 3'])
 gem "rake", "10.1.1", :require => false
 
 group(:development, :test) do

acceptance/tests/resource/file/source_attribute.rb

@@ -169,14 +169,11 @@ class source_test_module {
   end
 
   step "touch files and verify they're updated with ctime/mtime"
-  # wait until we're not at the file's mtime
-  #   mod_dir_source_file is the last file modified
-  #   This stat will not work on most BSDs
-  dir_file_mtime = on(master, "stat --format '%Y' #{mod_source_dir_file}").stdout.chomp
-  master_time    = on(master, 'date +%s').stdout.chomp
-  until master_time > dir_file_mtime do
-    master_time  = on(master, 'date +%s').stdout.chomp
-  end
+  # wait until we're not at the mtime of files on the agents
+  # this could be done cross-platform using Puppet, but a single puppet query is unlikely to be less than a second,
+  # and iterating over all agents would be much slower
+  sleep(1)
+
   on master, "touch #{mod_source_file} #{mod_source_dir_file}"
   agents.each do |agent|
     on(agent, puppet('agent', "--test --server #{master}"), :acceptable_exit_codes => [0,2]) do

ext/build_defaults.yaml

@@ -28,7 +28,7 @@ build_msi:
       x64: 'cfacter-0.3.0-x64.zip'
     path: 'http://builds.puppetlabs.lan/cfacter/0.3.0/artifacts/windows'
   hiera:
-    ref: 'refs/tags/1.3.4'
+    ref: 'refs/tags/2.0.0'
     repo: 'git://github.com/puppetlabs/hiera.git'
   mcollective:
     ref: 'refs/tags/2.7.0'

ext/debian/control

@@ -3,15 +3,15 @@ Section: admin
 Priority: optional
 Maintainer: Puppet Labs <[email protected]>
 Uploaders: Micah Anderson <[email protected]>, Andrew Pollock <[email protected]>, Nigel Kersten <[email protected]>, Stig Sandbeck Mathisen <[email protected]>
-Build-Depends-Indep: ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), facter (>= 1.7.0), hiera (>= 1.0.0)
+Build-Depends-Indep: ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), facter (>= 1.7.0), hiera (>= 2.0.0)
 Build-Depends: debhelper (>= 7.0.0), openssl
 Standards-Version: 3.9.1
 Vcs-Git: git://github.com/puppetlabs/puppet
 Homepage: http://projects.puppetlabs.com/projects/puppet
 
 Package: puppet-common
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.7.0), libjson-ruby | ruby-json
+Depends: ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 2.0.0), facter (>= 1.7.0), libjson-ruby | ruby-json
 Recommends: lsb-release, debconf-utils
 Suggests: ruby-selinux | libselinux-ruby1.8
 Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)

ext/project_data.yaml

@@ -16,7 +16,7 @@ gem_default_executables: 'puppet'
 gem_forge_project: 'puppet'
 gem_runtime_dependencies:
   facter: ['> 2.0', '< 4']
-  hiera: ['> 1.0', '< 3']
+  hiera: ['>= 2.0', '< 3']
   json_pure:
 gem_rdoc_options:
   - --title

ext/redhat/puppet.spec.erb

@@ -39,7 +39,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  facter >= 1:1.7.0
 # Puppet 3.x drops ruby 1.8.5 support and adds ruby 1.9 support
 BuildRequires:  ruby >= 1.8.7
-BuildRequires:  hiera >= 1.0.0
+BuildRequires:  hiera >= 2.0.0
 BuildArch:      noarch
 Requires:       ruby >= 1.8
 Requires:       ruby-shadow
@@ -58,7 +58,7 @@ Requires:       facter >= 1:1.7.0
 # Puppet 3.x drops ruby 1.8.5 support and adds ruby 1.9 support
 # Ruby 1.8.7 available for el5 at: yum.puppetlabs.com/el/5/devel/$ARCH
 Requires:       ruby >= 1.8.7
-Requires:       hiera >= 1.0.0
+Requires:       hiera >= 2.0.0
 Obsoletes:      hiera-puppet < 1.0.0
 Provides:       hiera-puppet >= 1.0.0
 %{!?_without_augeas:Requires: ruby-augeas}