diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-01-07 12:18:18 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-01-07 12:18:18 -0800 |
| commit | 0f0c70cae2e022d7614b8d847fa42bf95f5c3d0d (patch) | |
| tree | 94ae5c8e311dcff41ada692184a28331ab8566cf | |
| parent | f663182c28c9d4533ad4c2f897e5fbbf78b16d8e (diff) | |
| parent | 2d8884487159a29fa0a6b89379d5fc1b11c2652c (diff) | |
| download | puppet-0f0c70cae2e022d7614b8d847fa42bf95f5c3d0d.tar.gz puppet-0f0c70cae2e022d7614b8d847fa42bf95f5c3d0d.tar.xz puppet-0f0c70cae2e022d7614b8d847fa42bf95f5c3d0d.zip | |
Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile' into next
* maint/2.6.next/remove_rspec_options_from_rakefile:
maint: Add vim swap files to .gitignore
maint: Remove rspec options from the Rakefile
Manually Resolved Conflicts:
Rakefile
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Rakefile | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..a2082370b --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.rspec +results +.*.sw[op] @@ -43,7 +43,6 @@ desc "Create the tarball and the gem - use when releasing" task :puppetpackages => [:create_gem, :package] RSpec::Core::RakeTask.new do |t| - t.rspec_opts = ['--format','s', '--color', '--backtrace'] t.pattern ='spec/{unit,integration}/**/*.rb' t.fail_on_error = false end |