Merge pull request kubernetes#18390 from SpencerBrown/patch-1

Auto commit by PR queue bot
nikhiljindal · Dec 9, 2015 · b741386 · b741386
2 parents 361405e + 2a10556
commit b741386
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,10 @@
 .project
 .settings/**
 
+# Files generated by JetBrains IDEs, e.g. IntelliJ IDEA
+.idea/
+*.iml
+
 # This is where the result of the go build goes
 /output/**
 /output