opuppet/module-concat
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
module-concat/spec
History
Morgan Haskel 5f17a26256 Merge branch '1.0.x' into test_merge 
Conflicts:
	CHANGELOG.md
	Gemfile
	Modulefile
	README.markdown
	Rakefile
	files/concatfragments.sh
	manifests/setup.pp
	metadata.json
	spec/acceptance/backup_spec.rb
	spec/acceptance/concat_spec.rb
	spec/acceptance/empty_spec.rb
	spec/acceptance/fragment_source_spec.rb
	spec/acceptance/newline_spec.rb
	spec/acceptance/nodesets/centos-64-x64.yml
	spec/acceptance/nodesets/default.yml
	spec/acceptance/nodesets/fedora-18-x64.yml
	spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
	spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
	spec/acceptance/order_spec.rb
	spec/acceptance/replace_spec.rb
	spec/acceptance/symbolic_name_spec.rb
	spec/acceptance/warn_spec.rb
	spec/spec_helper_acceptance.rb
2014-09-10 15:03:35 -04:00
..
acceptance Merge branch '1.0.x' into test_merge 2014-09-10 15:03:35 -04:00
unit Lack of idempotency with ensure => 'absent' 2014-09-08 14:24:29 -04:00
spec.opts Sync files 2014-06-25 17:23:15 -07:00
spec_helper.rb Lets use puppetlabs_spec_helper 2012-06-23 17:13:08 -04:00
spec_helper_acceptance.rb Update spec_helper for consistency 2014-08-28 11:26:34 -04:00