ManageIQ/manageiq — pull request #142 by blomquisg (2014-07-02 21:31:49+00:00)
Title: Fix EmsOpenstack.verify_credentials sleeper bug

There's a bug in the way that the auth_type is merged into the options used by
EmsOpenstack.verify_credentials. Fortunately, it's obscured by the conditional
assignment operator on the first line of the method.

Now the options are merged into the original hash.

This fix will be hard to test since there is no demonstrable way to produce an
actual problem.