Ashley Penney 3c48598eeb Merge branch '1.5.x' into merge ... Conflicts: Gemfile spec/acceptance/apt_key_provider_spec.rb		2014-07-03 13:08:11 -04:00
..
acceptance	Merge pull request #316 from cmurphy/master	2014-06-26 13:53:18 -04:00
classes	Merge branch '1.5.x' into merge	2014-07-03 13:08:11 -04:00
defines	Merge pull request #304 from innyso/allow_url_for_key_server	2014-06-26 14:29:36 +02:00
unit	add facts showing available updates	2014-06-27 11:21:58 +01:00
spec.opts	Sync files	2014-06-25 17:23:12 -07:00
spec_helper.rb	Switch to the new puppetlabs_spec_helper gem	2012-05-31 15:32:03 -07:00
spec_helper_acceptance.rb	Add non Debian os family unsupported test.	2014-02-24 13:52:13 -08:00