summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-05-06 10:27:42 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-05-06 10:27:42 -0400
commit1d8e743921a48a5abd2ca75323321f6db261101b (patch)
tree8f3370fd2d9537a568d97e48ece9e18f3d0032bb /.gitignore
parent196d37e2ffa0d7f4221a857b143fd09f84a9d00b (diff)
parente0b2d98a6cac21cfa555afe4d660cb62c1180856 (diff)
downloadopenshift-1d8e743921a48a5abd2ca75323321f6db261101b.tar.gz
openshift-1d8e743921a48a5abd2ca75323321f6db261101b.tar.bz2
openshift-1d8e743921a48a5abd2ca75323321f6db261101b.tar.xz
openshift-1d8e743921a48a5abd2ca75323321f6db261101b.zip
Merge pull request #208 from openshift/master
Merge Master Into INT
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e25d99eeb..cacc711a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
.DS_Store
gce.ini
multi_ec2.yaml
+.vagrant