Merge branch 'master' into f-logrotator

2016-02-09 12:50:46 -08:00 · 2016-02-09 12:50:46 -08:00 · 96ddf38291
parent 9d6eed1fb4 2054a7ed47
commit 96ddf38291
1 changed files with 0 additions and 2 deletions
--- a/client/driver/raw_exec_test.go
+++ b/client/driver/raw_exec_test.go
@ -1,12 +1,10 @@
 package driver

 import (
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"path/filepath"
 	"reflect"
 	"testing"