summaryrefslogtreecommitdiffstats
path: root/nova/validate.py
diff options
context:
space:
mode:
authorjaypipes@gmail.com <>2010-08-30 10:36:59 -0400
committerjaypipes@gmail.com <>2010-08-30 10:36:59 -0400
commita1791cdca8dbca8f9bf3555b21324503aba58fda (patch)
tree12f297f1616172ca7e4bce76ecac1dcd737c83af /nova/validate.py
parentbf2549282067a7a824ea97e66a5b2f0ca06416bd (diff)
parent5f14a7955b9ef90afed91bda0343130d83e15a73 (diff)
downloadnova-a1791cdca8dbca8f9bf3555b21324503aba58fda.tar.gz
nova-a1791cdca8dbca8f9bf3555b21324503aba58fda.tar.xz
nova-a1791cdca8dbca8f9bf3555b21324503aba58fda.zip
Resolve conflicts and merge trunk
Diffstat (limited to 'nova/validate.py')
-rw-r--r--nova/validate.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/validate.py b/nova/validate.py
index a69306fad..21f4ed286 100644
--- a/nova/validate.py
+++ b/nova/validate.py
@@ -57,6 +57,7 @@ def rangetest(**argchecks): # validate ranges for both+defaults
return onCall
return onDecorator
+
def typetest(**argchecks):
def onDecorator(func):
import sys