Merge remote-tracking branch 'upstream/release_15.05' into dev

This commit is contained in:
Nate Coraor
2015-05-19 11:01:25 -04:00
+1 -1
View File
@@ -1678,7 +1678,7 @@ class BaseDataToolParameter( ToolParameter ):
class_name = self.__class__.__name__
assert trans is not None, "%s requires a trans" % class_name
if history is None:
history = trans.get_history( create=True )
history = trans.get_history()
assert history is not None, "%s requires a history" % class_name
return history