~juju-core/juju-core/trunk

Viewing all changes in revision 4119.

  • Committer: Juju bot
  • Date: 2015-03-05 23:00:55 UTC
  • mfrom: (3956.6.3)
  • Revision ID: git-v1:45afeed844a6552a7846f1809106337afdaa5bfc
Merge pull request #1536 from natefinch/fix-joyent

Don't use id_rsa as a default ssh key for joyent

Instead of using id_rsa, just return an error.

This fixes https://bugs.launchpad.net/juju-core/+bug/1415671

(Review request: http://reviews.vapour.ws/r/861/)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: