aboutsummaryrefslogtreecommitdiff
path: root/go/util/config.go
diff options
context:
space:
mode:
authorBrian McQueen <bmcquee@l-sclX1Q0DV7-M.local>2014-12-14 00:13:51 -0800
committerBrian McQueen <bmcquee@l-sclX1Q0DV7-M.local>2014-12-14 00:13:51 -0800
commita3583e4e7cdba69346397b963193eda9ed10c3a3 (patch)
tree5c984294280a16779c416a90f0f19e28cb98e7f4 /go/util/config.go
parentbd664def45925d81dfae9c7edfb244d2367170ca (diff)
parente431d4121e8da8d7fc243b29b780c2cd535a4210 (diff)
downloadseaweedfs-a3583e4e7cdba69346397b963193eda9ed10c3a3.tar.xz
seaweedfs-a3583e4e7cdba69346397b963193eda9ed10c3a3.zip
Merge branch 'master' of https://github.com/chrislusf/weed-fs
Diffstat (limited to 'go/util/config.go')
-rw-r--r--go/util/config.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/go/util/config.go b/go/util/config.go
index 050fd0e64..4cf1d7c64 100644
--- a/go/util/config.go
+++ b/go/util/config.go
@@ -10,9 +10,10 @@ package util
import (
"bytes"
- "github.com/chrislusf/weed-fs/go/glog"
"encoding/json"
"os"
+
+ "github.com/chrislusf/weed-fs/go/glog"
)
type Config struct {