Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(maint) modsync update - stable #163

Merged
merged 1 commit into from
Apr 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,10 @@ appveyor.yml:
RUBY_VER: 193
- PUPPET_GEM_VERSION: 3.7.0
RUBY_VER: 200-x64
LICENSE:
license_type: 'puppetpe'
NOTICE:
unmanaged: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

MAINTAINERS.md:
maintainers:
- "Puppet Windows Team `windows |at| puppet |dot| com`"
15 changes: 11 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,17 @@ if puppet_gem_location != :gem || puppetversion < '3.5.0'
if Gem::Platform.local.os == 'mingw32'
explicitly_require_windows_gems = true
end

if puppet_gem_location == :gem
# If facterversion hasn't been specified and we are
# looking for a Puppet Gem version less than 3.5.0, we
# need to ensure we get a good Facter for specs.
gem "facter",">= 1.6.11","<= 1.7.5",:require => false unless facterversion
# If hieraversion hasn't been specified and we are
# looking for a Puppet Gem version less than 3.5.0, we
# need to ensure we get a good Hiera for specs.
gem "hiera",">= 1.0.0","<= 1.3.0",:require => false unless hieraversion
end
end

if explicitly_require_windows_gems
Expand All @@ -91,10 +102,6 @@ if explicitly_require_windows_gems
gem "win32-security", "~> 0.1.2", :require => false
gem "win32-service", "0.7.2", :require => false
gem "minitar", "0.5.4", :require => false
# If facterversion hasn't been specified and we are
# looking for a Puppet Gem version less than 3.5.0, we
# need to ensure we get a good Facter for Windows specs.
gem "facter",">= 1.6.11","<= 1.7.5",:require => false unless facterversion
else
gem "ffi", "~> 1.9.0", :require => false
gem "win32-eventlog", "~> 0.5", :require => false
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This Module is only available for users of Puppet Enterprise with a valid Software License Agreement
for Puppet Enterprise. This Module is not available for users of Puppet software under an open source license.

By downloading this Module, you agree that you have a valid Software License Agreement with Puppet Labs for
By downloading this Module, you agree that you have a valid Software License Agreement with Puppet for
Puppet Enterprise and you further agree that your use of this Module is governed by the terms of that
Software License Agreement.
6 changes: 6 additions & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
## Maintenance

Maintainers:
- Puppet Windows Team `windows |at| puppet |dot| com`

Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `sqlserver`.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 1.1.x.{build}
skip_commits:
message: /(^\(?doc\)?.*|.*[A|a]cceptance [T|t]est.*)/
message: /^\(?doc\)?.*/
clone_depth: 10
init:
- SET
Expand Down