Merge pull request sodafoundation#407 from sodafoundation/csi-release-v2.1

Merge csi-release-v2.1 to master for the Release Cut

Author: NajmudheenCT

cindercompatibleapi/api/apiversion.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/astaxie/beego"
 	log "github.com/golang/glog"
-	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 	"github.com/sodafoundation/api/pkg/model"
+	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 )
 
 // VersionPortal ...

cindercompatibleapi/api/apiversion_test.go

@@ -22,8 +22,8 @@ import (
 	"testing"
 
 	"github.com/astaxie/beego"
-	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 	c "github.com/sodafoundation/api/client"
+	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 )
 
 func init() {

cindercompatibleapi/api/attachment.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/astaxie/beego"
 	log "github.com/golang/glog"
-	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 	"github.com/sodafoundation/api/pkg/model"
+	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 )
 
 // AttachmentPortal ...

cindercompatibleapi/api/attachment_test.go

@@ -23,8 +23,8 @@ import (
 	"testing"
 
 	"github.com/astaxie/beego"
-	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 	c "github.com/sodafoundation/api/client"
+	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 )
 
 func init() {

cindercompatibleapi/api/router.go

@@ -28,9 +28,9 @@ import (
 	"github.com/astaxie/beego"
 	bctx "github.com/astaxie/beego/context"
 	log "github.com/golang/glog"
-	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 	c "github.com/sodafoundation/api/client"
 	"github.com/sodafoundation/api/pkg/utils/constants"
+	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 )
 
 var (

cindercompatibleapi/api/snapshot.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/astaxie/beego"
 	log "github.com/golang/glog"
-	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 	"github.com/sodafoundation/api/pkg/model"
+	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 )
 
 // SnapshotPortal ...

cindercompatibleapi/api/snapshot_test.go

@@ -23,8 +23,8 @@ import (
 	"testing"
 
 	"github.com/astaxie/beego"
-	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 	c "github.com/sodafoundation/api/client"
+	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 )
 
 func init() {

cindercompatibleapi/api/volume.go

@@ -29,8 +29,8 @@ import (
 
 	"github.com/astaxie/beego"
 	log "github.com/golang/glog"
-	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 	"github.com/sodafoundation/api/pkg/model"
+	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 )
 
 // VolumePortal ...

cindercompatibleapi/api/volume_test.go

@@ -25,8 +25,8 @@ import (
 	"time"
 
 	"github.com/astaxie/beego"
-	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 	c "github.com/sodafoundation/api/client"
+	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 )
 
 func init() {

cindercompatibleapi/api/volumetype.go

@@ -27,8 +27,8 @@ import (
 
 	"github.com/astaxie/beego"
 	log "github.com/golang/glog"
-	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 	"github.com/sodafoundation/api/pkg/model"
+	"github.com/sodafoundation/nbp/cindercompatibleapi/converter"
 )
 
 // TypePortal ...