Bugs/de778#5

Open

schoksey wants to merge 2 commits intoCiscoSystems:cis-havanafrom

schoksey:bugs/de778

Commits on Oct 14, 2014

The fix is a clean up of the hybrid driver to simplify and consolidate the
schoksey
committed

Commits on Oct 19, 2014

- convert from StrOpts to ListOpts for builtin_user param
schoksey
committed