Resolve merge conflict with platformdefaults

This commit is contained in:
Neil Alexander 2018-07-07 20:08:23 +01:00
commit b24c7ffa6b
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
21 changed files with 170 additions and 106 deletions

View file

@ -11,10 +11,12 @@ import "encoding/json"
import "strconv"
import "os"
import "yggdrasil/defaults"
type admin_info map[string]interface{}
func main() {
server := flag.String("endpoint", "tcp://localhost:9001", "Admin socket endpoint")
server := flag.String("endpoint", defaults.GetDefaults().DefaultAdminListen, "Admin socket endpoint")
injson := flag.Bool("json", false, "Output in JSON format")
flag.Parse()
args := flag.Args()