[Pkg-puppet-devel] [facter] 14/352: Merge remote-tracking branch 'upstream/1.6.x' into stable

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 40b5dec679b00113693b629754eb339d5a317c50
Merge: a507907 43540e3
Author: Josh Cooper <josh at puppetlabs.com>
Date:   Mon Sep 9 10:57:55 2013 -0700

    Merge remote-tracking branch 'upstream/1.6.x' into stable
    
    * upstream/1.6.x:
      (#20301) Handle different error in ruby 1.9
      Maint: Don't try to install json gem on Windows

 Gemfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --cc Gemfile
index 5f7178e,986731d..28fc38b
--- a/Gemfile
+++ b/Gemfile
@@@ -14,22 -6,14 +14,23 @@@ en
  
  group :development, :test do
    gem 'rake'
-   gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__)
 -  gem 'rspec', "~> 2.11.0", :require => false
 -  gem 'mocha', "~> 0.10.5", :require => false
 -  gem 'json', "~> 1.7", :platforms => :ruby, :require => false
 -  gem 'puppetlabs_spec_helper', :require => false
 +  gem 'rspec', "~> 2.11.0"
 +  gem 'mocha', "~> 0.10.5"
-   gem 'json', "~> 1.7", :platforms => :ruby_18
++  gem 'json', "~> 1.7", :platforms => :ruby
 +  gem 'puppetlabs_spec_helper'
 +end
 +
 +platform :mswin, :mingw do
 +  gem "sys-admin", "~> 1.5.6"
 +  gem "win32-api", "~> 1.4.8"
 +  gem "win32-dir", "~> 0.3.7"
 +  gem "windows-api", "~> 0.4.1"
 +  gem "windows-pr", "~> 1.2.1"
 +  gem "win32console", "~> 1.3.2"
  end
  
 -gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__), :require => false
++gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__)
+ 
  if File.exists? "#{__FILE__}.local"
    eval(File.read("#{__FILE__}.local"), binding)
  end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git