Skip to content

Commit d383825

Browse files
authored
Merge pull request #130 from puppetlabs/CAT-1608-pdk-update
(CAT-1608) - PDK update
2 parents 61f21a7 + 0846246 commit d383825

15 files changed

+856
-136
lines changed

.gitattributes

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*.rb eol=lf
2+
*.erb eol=lf
3+
*.pp eol=lf
4+
*.sh eol=lf
5+
*.epp eol=lf

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt

.pdkignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt
@@ -29,7 +29,6 @@
2929
/.fixtures.yml
3030
/Gemfile
3131
/.gitattributes
32-
/.github/
3332
/.gitignore
3433
/.pdkignore
3534
/.puppet-lint.rc

.rspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
--format documentation
21
--color
2+
--format documentation

0 commit comments

Comments
 (0)