Skip to content

Commit

Permalink
Update snmp to 90254293f6bf097eca7096562ac63f31a0bc75f4
Browse files Browse the repository at this point in the history
90254293f6bf097eca7096562ac63f31a0bc75f4 Merge branch 'release/3.4.0'
c2f44baeb8c61908264252ef1d309ef28028a70a Update versions for 3.4.0 release.
7d4fc4b78c1e8cabc864ef5506f2633eb4e309da Add a pause after service stop and before creating SNMPv3 users.
bbb4f24e5b9dc54c8cee51ca6a48e4aac84bbe42 Merge branch 'feature/README.markdown' into develop
0ed3e5b82d18a177ec0a371ce90d2f9f16e5e4ee Add links in the reference section of the README.
b3765be33c5d454f962a8c4180412fab3d24e844 Better define Access Control variables in README.
03070c2568f73d8b58c88712d631a09ee98a19f6 Shorten metadata.json summary to 144 characters.
dca58e8e2cc077c9a2680e7b944df4515f0b69dc Improvements to README.markdown.
f455ffe9922a918af23f594d5a03631aeff32e3a Added Access Control section to README.markdown.
4789e77ddbade72df041149a6ad61dd540600f8b Convert to new README.markdown format.
7db30c9b1077e74135ca64863faa9feedda99c7e Fix rwcommmunity6 typo.
7174e9fa5f507f9ac84068bbad34ebb4517edd15 Merge branch 'typo101-typo101-config-dir-patch' into develop
03671e90a42a137cd0086e71faa771d7d4275cc3 fix typo in freebsd config dir perms and ownership
a55bf2d7dff29f945c238f6b592e4ca5c66de9ce Now supporting Puppet 4.
d443402d0bf02205e5a6685b0d6ce6830f0d2e45 Unit test against Puppet 4 via modulesync.
d290b968dde6d37457b81236df7cd39ae6e043de Update Geppetto .project.
e785845b51d62abf2e8ea739cf4ca5401cc84205 Update Puppet 4 gem and support puppet_blacksmith with modulesync.
7a6766403f498d6cb855e6749eae11b4b28d10df Merge branch 'feature/future_parser' into develop
adccc35c7af886ec5c168e33668f075efde006fb Fix lint: variable assigned to the empty string.
f0e5ad7b63b4d91650435451110aa804b4534012 Fix lint: class included by relative name.
49ad65ebf9344549dd6cbf888fd373dd0be24db7 Get code ready for Puppet 4.
e497692a9629aa014a61442f4e8760826f837b30 Merge branch 'feature/el7' into develop
600a538a1a4a5b3148b1c47a6f1de212d470c9d2 fixed a small typo in example
4510ffd4a805bf69a5e3dacee76df8d40466a1af Add rspec tests specifically for EL5.
302405fdcf0b7665730c5f31d7510bb39316b12c Set EL7 options to work with systemd.
f3dfad58d1c7bbff69218a93da311d04c9ab77c8 Merge branch 'develop' of github.com:razorsedge/puppet-snmp into develop
dc40611b99952ae377954897fb05a04810128f77 Merge pull request redhat-openstack#41 from bdellegrazie/handle_empty_rocommunity
39beba465a1a1b496142f76caaa40ca52577262f skip zero length strings in ERB template output
fc404e6abbe9230cd9ddc88f918f665ee15479ae Shorten metadata summary to less than 144 characters.
520cc9ffd461c663b5bdb26069801aea88ec4f2f Stick with rspec 2 for unit tests.
991e4a719e9413e01d288a3ea98531e28809b535 Fix puppetlint rake task with modulesync.
7d90a6e77cced0d850bf92b19482590ea4951a68 'subject' method no longer exists in rspec-puppet.
2fb0218f40433f323cf7fa523c25be73c1e14214 Update rspec-puppet ~> 2.0 and metadata-json-lint >= 0.0.4 with modulesync.
a3b9489717935b85a4c198e79107c124538de3fd Merge branch 'release/3.3.1' into develop

Change-Id: I0d39500d267f0ebe5ba23e67d80564f39243e88c
  • Loading branch information
xbezdick committed Oct 13, 2015
1 parent 078f6a7 commit 356b26c
Show file tree
Hide file tree
Showing 15 changed files with 754 additions and 272 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ mod 'sahara',
:git => 'https://github.com/openstack/puppet-sahara.git'

mod 'snmp',
:commit => '64f1a6976830bb4e96176a7296e8d14f65df0cac',
:commit => '90254293f6bf097eca7096562ac63f31a0bc75f4',
:git => 'https://github.com/razorsedge/puppet-snmp.git'

mod 'ssh',
Expand Down
9 changes: 9 additions & 0 deletions snmp/.project
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,14 @@
<arguments>1.0-projectRelativePath-matches-false-false-spec/fixtures/modules</arguments>
</matcher>
</filter>
<filter>
<id>1428386119416</id>
<name></name>
<type>10</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-matches-false-false-.vendor</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 5 additions & 6 deletions snmp/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: ruby
cache:
directories:
- vendor/bundle
- spec/fixtures/modules
# - spec/fixtures/modules
sudo: false
branches:
only:
Expand All @@ -24,11 +24,10 @@ matrix:
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
allow_failures:
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 4.0"
notifications:
email:
- [email protected]
26 changes: 13 additions & 13 deletions snmp/Gemfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"

group :development, :unit_tests do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
gem 'metadata-json-lint', :require => false
end

group :system_tests do
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
gem 'rake', :require => false
gem 'rspec', '~> 2.0', :require => false
gem 'rspec-puppet', '>= 2.1.0', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', '>= 1.1.0', :require => false
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
gem 'metadata-json-lint', '>= 0.0.4', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
gem 'puppet-lint-empty_string-check', :require => false
gem 'puppet-lint-leading_zero-check', :require => false
gem 'puppet-lint-variable_contains_upcase', :require => false
end

if facterversion = ENV['FACTER_GEM_VERSION']
Expand Down
Loading

0 comments on commit 356b26c

Please sign in to comment.