Merge branch 'master' into storage_refactor

2017-06-21 10:51:26 -03:00
parent 3a13358739 49ad6cded3
commit 824d5334df
12 changed files with 321 additions and 14 deletions
--- a/pwd/pwd.go
+++ b/pwd/pwd.go
@@ -63,6 +63,7 @@ type PWDApi interface {
 	InstanceGet(session *types.Session, name string) *types.Instance
 	InstanceFindByIP(ip string) *types.Instance
 	InstanceFindByAlias(sessionPrefix, alias string) *types.Instance
+	InstanceFindByIPAndSession(sessionPrefix, ip string) *types.Instance
 	InstanceDelete(session *types.Session, instance *types.Instance) error
 	InstanceWriteToTerminal(instance *types.Instance, data string)
 	InstanceAllowedImages() []string