~harlowja/cloud-init/adjusted-merging

Viewing all changes in revision 1040.

  • Committer: Joshua Harlow
  • Date: 2014-11-22 20:36:46 UTC
  • mfrom: (1029.2.4 cloud-init)
  • Revision ID: harlowja@gmail.com-20141122203646-8xnc28ptwhwdm20u
Be more tolerant of 'ssh_authorized_keys' types

Instead of only expected a list, tuple, or set type
allow for a string type and dict to be passed in for 'ssh_authorized_keys',
and add log message that occurs if some other type is used that
can not be correctly processed. 

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: