pkg: ioutils -> ioutil

This commit is contained in:
Brian Waldon 2015-01-22 17:14:01 -08:00
parent f16ff64949
commit 2120af8cfc
4 changed files with 5 additions and 5 deletions

View File

@ -14,7 +14,7 @@
limitations under the License. limitations under the License.
*/ */
package ioutils package ioutil
import "io" import "io"

View File

@ -14,7 +14,7 @@
limitations under the License. limitations under the License.
*/ */
package ioutils package ioutil
import ( import (
"bytes" "bytes"

View File

@ -24,7 +24,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/coreos/etcd/pkg/ioutils" pioutil "github.com/coreos/etcd/pkg/ioutil"
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/raft/raftpb"
@ -81,7 +81,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Limit the data size that could be read from the request body, which ensures that read from // Limit the data size that could be read from the request body, which ensures that read from
// connection will not time out accidentally due to possible block in underlying implementation. // connection will not time out accidentally due to possible block in underlying implementation.
limitedr := ioutils.NewLimitedBufferReader(r.Body, ConnReadLimitByte) limitedr := pioutil.NewLimitedBufferReader(r.Body, ConnReadLimitByte)
b, err := ioutil.ReadAll(limitedr) b, err := ioutil.ReadAll(limitedr)
if err != nil { if err != nil {
log.Println("rafthttp: error reading raft message:", err) log.Println("rafthttp: error reading raft message:", err)

2
test
View File

@ -15,7 +15,7 @@ COVER=${COVER:-"-cover"}
source ./build source ./build
# Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt. # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt.
TESTABLE_AND_FORMATTABLE="client discovery error etcdctl/command etcdmain etcdserver etcdserver/etcdhttp etcdserver/etcdhttp/httptypes integration migrate pkg/fileutil pkg/flags pkg/idutil pkg/ioutils pkg/netutil pkg/pbutil pkg/types pkg/transport pkg/wait proxy raft rafthttp snap store wal" TESTABLE_AND_FORMATTABLE="client discovery error etcdctl/command etcdmain etcdserver etcdserver/etcdhttp etcdserver/etcdhttp/httptypes integration migrate pkg/fileutil pkg/flags pkg/idutil pkg/ioutil pkg/netutil pkg/pbutil pkg/types pkg/transport pkg/wait proxy raft rafthttp snap store wal"
FORMATTABLE="$TESTABLE_AND_FORMATTABLE *.go etcdctl/" FORMATTABLE="$TESTABLE_AND_FORMATTABLE *.go etcdctl/"
# user has not provided PKG override # user has not provided PKG override