Merge pull request #41 from estesp/update-travis-go

crosbymichael · web-flow · commit c75560214246 · 2018-03-09T10:43:37.000-05:00
Update Go versions for travis
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: go
 go:
-    - 1.8.x
+    - 1.10.x
+    - tip
 
 install:
     - mkdir -p $GOPATH/src/github.com/prometheus $GOPATH/src/github.com/opencontainers
diff --git a/devices.go b/devices.go
@@ -74,11 +74,11 @@ func (d *devicesController) Update(path string, resources *specs.LinuxResources)
 }
 
 func deviceString(device specs.LinuxDeviceCgroup) string {
-	return fmt.Sprintf("%c %s:%s %s",
-		&device.Type,
+	return fmt.Sprintf("%s %s:%s %s",
+		device.Type,
 		deviceNumber(device.Major),
 		deviceNumber(device.Minor),
-		&device.Access,
+		device.Access,
 	)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,11 @@ func (d devicesController) Update(path string, resources specs.LinuxResources)`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`func deviceString(device specs.LinuxDeviceCgroup) string {`
`77`		`- return fmt.Sprintf("%c %s:%s %s",`
`78`		`- &device.Type,`
	`77`	`+ return fmt.Sprintf("%s %s:%s %s",`
	`78`	`+ device.Type,`
`79`	`79`	`deviceNumber(device.Major),`
`80`	`80`	`deviceNumber(device.Minor),`
`81`		`- &device.Access,`
	`81`	`+ device.Access,`
`82`	`82`	`)`
`83`	`83`	`}`
`84`	`84`