Merge 1d28a04 into b41569d

google · Aug 25, 2019 · 807588f · 807588f
2 parents b41569d + 1d28a04
commit 807588f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/filesystem/mountpoint.go b/filesystem/mountpoint.go
@@ -22,8 +22,16 @@
 package filesystem
 
 import (
+	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"sync"
+
+	"github.com/pkg/errors"
 )
 
 /*
@@ -35,17 +43,6 @@ const char* read_mode = "r";
 */
 import "C"
 
-import (
-	"fmt"
-	"log"
-	"path/filepath"
-	"sort"
-	"strings"
-	"sync"
-
-	"github.com/pkg/errors"
-)
-
 var (
 	// These maps hold data about the state of the system's mountpoints.
 	mountsByPath   map[string]*Mount

diff --git a/metadata/metadata.pb.go b/metadata/metadata.pb.go