Merge fb2f26d into ee6b714

glide.yaml

@@ -1,12 +1,10 @@
 package: github.com/m3db/m3ctl
 
 import:
-- package: github.com/m3db/m3cluster
-  version: 53fc512c11e1ed03db2d65dac4c139a3c2ff2eda
-- package: github.com/m3db/m3metrics
-  version: dcfe68fe112095f688cbaa1b0aa4c4ac65922e84
+- package: github.com/m3db/m3
+  version: 16e2dfb2206a8ead03f733a7032b1bc2b83d4b93
 - package: github.com/m3db/m3x
-  version: a5cc485300c733558a25e1e6c5e9dcf4dbc241c4
+  version: 943173a151c8a6b2da1f93f814c27c4e4a1e2050
 - package: github.com/apache/thrift
   version: 9549b25c77587b29be4e0b5c258221a4ed85d37a
 - package: github.com/beorn7/perks

service/r2/io.go

@@ -28,7 +28,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/m3db/m3metrics/rules/view/changes"
+	"github.com/m3db/m3/src/metrics/rules/view/changes"
 
 	validator "gopkg.in/go-playground/validator.v9"
 )

service/r2/routes.go

@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/m3db/m3metrics/rules/view"
+	"github.com/m3db/m3/src/metrics/rules/view"
 
 	"github.com/gorilla/mux"
 )

service/r2/routes_test.go

@@ -29,11 +29,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/m3db/m3/src/metrics/rules"
+	"github.com/m3db/m3/src/metrics/rules/view"
+	"github.com/m3db/m3/src/metrics/rules/view/changes"
 	"github.com/m3db/m3ctl/auth"
 	"github.com/m3db/m3ctl/service/r2/store"
-	"github.com/m3db/m3metrics/rules"
-	"github.com/m3db/m3metrics/rules/view"
-	"github.com/m3db/m3metrics/rules/view/changes"
 	"github.com/m3db/m3x/clock"
 	"github.com/m3db/m3x/instrument"
 

service/r2/store/kv/options.go

@@ -23,7 +23,7 @@ package kv
 import (
 	"time"
 
-	"github.com/m3db/m3metrics/rules"
+	"github.com/m3db/m3/src/metrics/rules"
 	"github.com/m3db/m3x/clock"
 	"github.com/m3db/m3x/instrument"
 )

service/r2/store/kv/store.go

@@ -24,12 +24,12 @@ import (
 	"errors"
 	"fmt"
 
+	merrors "github.com/m3db/m3/src/metrics/errors"
+	"github.com/m3db/m3/src/metrics/rules"
+	"github.com/m3db/m3/src/metrics/rules/view"
+	"github.com/m3db/m3/src/metrics/rules/view/changes"
 	"github.com/m3db/m3ctl/service/r2"
 	r2store "github.com/m3db/m3ctl/service/r2/store"
-	merrors "github.com/m3db/m3metrics/errors"
-	"github.com/m3db/m3metrics/rules"
-	"github.com/m3db/m3metrics/rules/view"
-	"github.com/m3db/m3metrics/rules/view/changes"
 	"github.com/m3db/m3x/clock"
 	xerrors "github.com/m3db/m3x/errors"
 )

service/r2/store/kv/store_test.go

@@ -24,15 +24,15 @@ import (
 	"testing"
 	"time"
 
+	"github.com/m3db/m3/src/metrics/aggregation"
+	merrors "github.com/m3db/m3/src/metrics/errors"
+	"github.com/m3db/m3/src/metrics/pipeline"
+	"github.com/m3db/m3/src/metrics/policy"
+	"github.com/m3db/m3/src/metrics/rules"
+	"github.com/m3db/m3/src/metrics/rules/view"
+	"github.com/m3db/m3/src/metrics/rules/view/changes"
 	"github.com/m3db/m3ctl/service/r2"
 	r2store "github.com/m3db/m3ctl/service/r2/store"
-	"github.com/m3db/m3metrics/aggregation"
-	merrors "github.com/m3db/m3metrics/errors"
-	"github.com/m3db/m3metrics/pipeline"
-	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3metrics/rules"
-	"github.com/m3db/m3metrics/rules/view"
-	"github.com/m3db/m3metrics/rules/view/changes"
 	"github.com/m3db/m3x/clock"
 
 	"github.com/golang/mock/gomock"

service/r2/store/store.go

@@ -21,8 +21,8 @@
 package store
 
 import (
-	"github.com/m3db/m3metrics/rules/view"
-	"github.com/m3db/m3metrics/rules/view/changes"
+	"github.com/m3db/m3/src/metrics/rules/view"
+	"github.com/m3db/m3/src/metrics/rules/view/changes"
 )
 
 // Store is a construct that can perform operations against a backing rule store.

service/r2/store/store_mock.go

@@ -24,8 +24,8 @@
 package store
 
 import (
-	"github.com/m3db/m3metrics/rules/view"
-	"github.com/m3db/m3metrics/rules/view/changes"
+	"github.com/m3db/m3/src/metrics/rules/view"
+	"github.com/m3db/m3/src/metrics/rules/view/changes"
 
 	"github.com/golang/mock/gomock"
 )

service/r2/store/stub/store.go

@@ -25,14 +25,14 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/m3db/m3/src/metrics/aggregation"
+	"github.com/m3db/m3/src/metrics/pipeline"
+	"github.com/m3db/m3/src/metrics/policy"
+	"github.com/m3db/m3/src/metrics/rules/view"
+	"github.com/m3db/m3/src/metrics/rules/view/changes"
+	"github.com/m3db/m3/src/metrics/x/bytes"
 	"github.com/m3db/m3ctl/service/r2"
 	r2store "github.com/m3db/m3ctl/service/r2/store"
-	"github.com/m3db/m3metrics/aggregation"
-	"github.com/m3db/m3metrics/pipeline"
-	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3metrics/rules/view"
-	"github.com/m3db/m3metrics/rules/view/changes"
-	"github.com/m3db/m3metrics/x/bytes"
 	"github.com/m3db/m3x/instrument"
 
 	"github.com/pborman/uuid"

services/r2ctl/config/r2ctl.go

@@ -24,15 +24,15 @@ import (
 	"errors"
 	"time"
 
-	"github.com/m3db/m3cluster/client/etcd"
-	clusterkv "github.com/m3db/m3cluster/kv"
+	"github.com/m3db/m3/src/cluster/client/etcd"
+	clusterkv "github.com/m3db/m3/src/cluster/kv"
+	"github.com/m3db/m3/src/metrics/rules"
+	ruleskv "github.com/m3db/m3/src/metrics/rules/store/kv"
+	"github.com/m3db/m3/src/metrics/rules/validator"
 	"github.com/m3db/m3ctl/auth"
 	r2store "github.com/m3db/m3ctl/service/r2/store"
 	r2kv "github.com/m3db/m3ctl/service/r2/store/kv"
 	"github.com/m3db/m3ctl/service/r2/store/stub"
-	"github.com/m3db/m3metrics/rules"
-	ruleskv "github.com/m3db/m3metrics/rules/store/kv"
-	"github.com/m3db/m3metrics/rules/validator"
 	"github.com/m3db/m3x/instrument"
 	"github.com/m3db/m3x/log"
 )

services/r2ctl/main/main.go

@@ -55,7 +55,7 @@ func main() {
 	}
 
 	var cfg config.Configuration
-	if err := xconfig.LoadFile(&cfg, *configFile); err != nil {
+	if err := xconfig.LoadFile(&cfg, *configFile, xconfig.Options{}); err != nil {
 		fmt.Printf("error loading config file: %v\n", err)
 		os.Exit(1)
 	}