Browse Source

use github.com/golang/protobuf/proto instead of code.google.com/p/goprotobuf/proto

pull/38/head
yanyiwu 10 years ago
parent
commit
5b7628cf08
  1. 2
      go/operation/system_message.pb.go
  2. 2
      go/operation/system_message_test.go
  3. 2
      go/storage/store.go
  4. 2
      go/weed/weed_server/master_server_handlers_admin.go

2
go/operation/system_message.pb.go

@ -14,7 +14,7 @@ It has these top-level messages:
*/ */
package operation package operation
import proto "code.google.com/p/goprotobuf/proto"
import "github.com/golang/protobuf/proto"
import math "math" import math "math"
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

2
go/operation/system_message_test.go

@ -5,7 +5,7 @@ import (
"log" "log"
"testing" "testing"
proto "code.google.com/p/goprotobuf/proto"
"github.com/golang/protobuf/proto"
) )
func TestSerialDeserial(t *testing.T) { func TestSerialDeserial(t *testing.T) {

2
go/storage/store.go

@ -9,10 +9,10 @@ import (
"strconv" "strconv"
"strings" "strings"
proto "code.google.com/p/goprotobuf/proto"
"github.com/chrislusf/weed-fs/go/glog" "github.com/chrislusf/weed-fs/go/glog"
"github.com/chrislusf/weed-fs/go/operation" "github.com/chrislusf/weed-fs/go/operation"
"github.com/chrislusf/weed-fs/go/util" "github.com/chrislusf/weed-fs/go/util"
"github.com/golang/protobuf/proto"
) )
const ( const (

2
go/weed/weed_server/master_server_handlers_admin.go

@ -8,12 +8,12 @@ import (
"strconv" "strconv"
"strings" "strings"
proto "code.google.com/p/goprotobuf/proto"
"github.com/chrislusf/weed-fs/go/glog" "github.com/chrislusf/weed-fs/go/glog"
"github.com/chrislusf/weed-fs/go/operation" "github.com/chrislusf/weed-fs/go/operation"
"github.com/chrislusf/weed-fs/go/storage" "github.com/chrislusf/weed-fs/go/storage"
"github.com/chrislusf/weed-fs/go/topology" "github.com/chrislusf/weed-fs/go/topology"
"github.com/chrislusf/weed-fs/go/util" "github.com/chrislusf/weed-fs/go/util"
"github.com/golang/protobuf/proto"
) )
func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.Request) { func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.Request) {

Loading…
Cancel
Save