[glide] Update m3x and m3cluster dependencies

m3db · Sep 14, 2017 · 2e7b77f · 2e7b77f
1 parent cb146ce
commit 2e7b77f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -2,11 +2,11 @@ package: github.com/m3db/m3ctl
 
 import:
 - package: github.com/m3db/m3cluster
-  version: d64606edb68599677fd335ceed86d990d13d2991
+  version: 3ca6883175651960ca2f93ba91198bbb9a84f5be
 - package: github.com/m3db/m3metrics
   version: 286dfad168595a1b0f2b2cd676e21e8b34fe08a5
 - package: github.com/m3db/m3x
-  version: 9e66dd6d48a872bae1bdddb9bf85a33e99129267
+  version: 6e9713eca6718643e105f574be392f122bcc062e
 - package: github.com/apache/thrift
   version: 9549b25c77587b29be4e0b5c258221a4ed85d37a
 - package: github.com/beorn7/perks

diff --git a/services/r2ctl/main/main.go b/services/r2ctl/main/main.go
@@ -81,7 +81,7 @@ type configuration struct {
 	KVClient kvClientConfiguration `yaml:"kvClient" validate:"nonzero"`
 
 	// Logging configuration.
-	Logging xlog.Configuration `yaml:"logging"`
+	Logging log.Configuration `yaml:"logging"`
 
 	// Metrics configuration.
 	Metrics instrument.MetricsConfiguration `yaml:"metrics"`
@@ -100,7 +100,7 @@ func main() {
 	}
 
 	var cfg configuration
-	if err := xconfig.LoadFile(&cfg, *configFile); err != nil {
+	if err := config.LoadFile(&cfg, *configFile); err != nil {
 		fmt.Printf("error loading config file: %v\n", err)
 		os.Exit(1)
 	}