Commit Graph

4 Commits

Author SHA1 Message Date
0a70c974ec ssh_public_keys -> ssh_authorized_keys rename (merge fix) 2021-02-15 19:44:26 -06:00
dad6547825 Merge branch 'master' into multiple-hosts
Conflicts:
	capsulflask/console.py
	capsulflask/db.py
	capsulflask/shared.py
	capsulflask/virt_model.py
2021-02-15 17:52:17 -06:00
50cea6e0b4 first crack at adding ssh host key display to the capsul detail page 2021-01-30 01:39:48 -06:00
6764c5c97d got httpclient working, spoke heartbeat is working 2021-01-04 13:32:52 -06:00