summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-10 06:30:14 +0000
committerGerrit Code Review <review@openstack.org>2013-06-10 06:30:14 +0000
commitb1d4de7fa1ed86acc0228757fd24e1137bbab1a5 (patch)
tree1ca50d6a8b7ac615a189b6542eedcb2d83ac828c
parente5983f323950297d389dce8712a4616142bb37e6 (diff)
parent866320c0f70c3a16bc2d2e8e1aeb0d7d4b7f514a (diff)
downloadkeystone-b1d4de7fa1ed86acc0228757fd24e1137bbab1a5.tar.gz
keystone-b1d4de7fa1ed86acc0228757fd24e1137bbab1a5.tar.xz
keystone-b1d4de7fa1ed86acc0228757fd24e1137bbab1a5.zip
Merge "Ignore the .update-venv directory."
-rw-r--r--.gitignore1
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 97665029..16195c18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
vendor
.ksl-venv
.venv
+.update-venv/
.tox
keystone.egg-info/
*.log
diff --git a/tox.ini b/tox.ini
index ddb167ae..046e509d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,4 +35,4 @@ show-source = true
ignore = H304
builtins = _
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,vendor
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,vendor,.update-venv