Merge pull request kubernetes#66 from orsobruno/patch1

Ignore generated extension files and IntelliJ IDEA project files
MushuEE · Nov 6, 2017 · aead050 · aead050
2 parents 3df79aa + 69fc950
commit aead050
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+# IntelliJ IDEA
+.idea
 # Eclipse
 .checkstyle
 .project
@@ -12,3 +14,4 @@ Packages
 .DS_Store
 *~
 Package.resolved
+extensions/sample/generated