summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-05-06 10:27:44 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-05-06 10:27:44 -0400
commit803b9191f1a3a2bffe94528a8a5cd82adf6f3a42 (patch)
tree8f3370fd2d9537a568d97e48ece9e18f3d0032bb /.gitignore
parent519e097df31e2148ac520ab273d0bd2fb2f7bb43 (diff)
parente0b2d98a6cac21cfa555afe4d660cb62c1180856 (diff)
downloadopenshift-803b9191f1a3a2bffe94528a8a5cd82adf6f3a42.tar.gz
openshift-803b9191f1a3a2bffe94528a8a5cd82adf6f3a42.tar.bz2
openshift-803b9191f1a3a2bffe94528a8a5cd82adf6f3a42.tar.xz
openshift-803b9191f1a3a2bffe94528a8a5cd82adf6f3a42.zip
Merge pull request #209 from openshift/master
Merge Master Into Stage
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