Merge remote-tracking branch 'origin/master' into pete-fixes

[arvados.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8cf65b56b86c6726fefa74bf280d0c2b1c089563..0cddee596c4cf665b9359f1a6276c7ecdcfd3d49 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,21 @@
+.bundle
+.rvmrc
 *~
 *.pyc
-docker/*/generated/*
+docker/*/generated
 docker/config.yml
-doc/.site/*
+doc/.site
 doc/sdk/python/arvados
 sdk/perl/MYMETA.*
 sdk/perl/Makefile
-sdk/perl/blib/*
+sdk/perl/blib
 sdk/perl/pm_to_blib
+*/vendor/bundle
+services/keep/bin
+services/keep/pkg
+services/keep/src/github.com
+sdk/java/target
+*.class
+apps/workbench/vendor/bundle
+services/api/vendor/bundle
+sdk/java/log