tree bd20ea4bfaf717c2dd58fecce36399f6061a3293
parent a007ecfb0170a378247bcd81962f72a1427de588
parent b060441db2373faf931b1152e981330d27201acc
author Jenkins <jenkins@review.openstack.org> 1378313425 +0000
committer Gerrit Code Review <review@openstack.org> 1378313425 +0000

Merge "Add handling for inherited stress attributes"