Merge branch 'master' into add_remote_storage

weed/shell/commands.go

@@ -76,7 +76,7 @@ func (ce *CommandEnv) confirmIsLocked() error {
 		return nil
 	}
 
-	return fmt.Errorf("need to lock to continue")
+	return fmt.Errorf("need to run \"lock\" first to continue")
 
 }