Merge "Raise AssertionError instead of eventlet.timeout.Timeout when failing."
tree: 7df26ccc94bf64e7e47955700bfbeac4e1430cdd
  1. neutron/