Colleen Murphy
|
440a6b7be3
|
Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
|
2014-12-08 10:23:21 -08:00 |
|
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 |
|
Colleen Murphy
|
2b51a83b9b
|
Sync files
|
2014-06-25 17:23:15 -07:00 |
|
Morgan Haskel
|
6b9e8ddc37
|
Add nodeset for ubuntu trusty.
|
2014-05-14 16:14:53 -04:00 |
|
Morgan Haskel
|
33b90b4fbc
|
Fixes to get tests running on trusty.
|
2014-05-14 16:10:03 -04:00 |
|
Ashley Penney
|
a2df44a967
|
Fix newlines.
Previously the newline handling modified the actual fragments, causing
multiple runs to always update the newlines. Handle this appropriately.
|
2014-04-21 18:36:59 -04:00 |
|
Ashley Penney
|
596cec14be
|
Port over acceptance tests from master.
|
2014-02-12 17:47:43 -05:00 |
|
Hunter Haugen
|
20e8d6e4f6
|
Convert specs to beaker and increase coverage
|
2014-01-16 16:49:30 -08:00 |
|