Switching to the pinned version of msgpack

erikdubbelboer · Oct 18, 2014 · ce4aa7b · ce4aa7b
1 parent ad445f5
commit ce4aa7b
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/command/agent/rpc.go b/command/agent/rpc.go
@@ -26,7 +26,7 @@ import (
 	"fmt"
 	"github.com/hashicorp/logutils"
 	"github.com/hashicorp/serf/serf"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 	"io"
 	"log"
 	"net"

diff --git a/command/agent/rpc_client.go b/command/agent/rpc_client.go
@@ -4,7 +4,7 @@ import (
 	"bufio"
 	"fmt"
 	"github.com/hashicorp/logutils"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 	"log"
 	"net"
 	"sync"

diff --git a/command/agent/util.go b/command/agent/util.go
@@ -11,7 +11,7 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 )
 
 const (

diff --git a/consul/fsm.go b/consul/fsm.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/raft"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 )
 
 // consulFSM implements a finite state machine that is used

diff --git a/consul/mdb_table_test.go b/consul/mdb_table_test.go
@@ -3,7 +3,7 @@ package consul
 import (
 	"bytes"
 	"github.com/armon/gomdb"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 	"io/ioutil"
 	"os"
 	"reflect"

diff --git a/consul/pool.go b/consul/pool.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/hashicorp/yamux"
 	"github.com/inconshreveable/muxado"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 )
 
 // msgpackHandle is a shared handle for encoding/decoding of RPC messages

diff --git a/consul/rpc.go b/consul/rpc.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/consul/consul/structs"
 	"github.com/hashicorp/yamux"
 	"github.com/inconshreveable/muxado"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 	"io"
 	"math/rand"
 	"net"

diff --git a/consul/status_endpoint_test.go b/consul/status_endpoint_test.go
@@ -2,7 +2,7 @@ package consul
 
 import (
 	"github.com/hashicorp/consul/testutil"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 	"net"
 	"net/rpc"
 	"os"

diff --git a/consul/structs/structs.go b/consul/structs/structs.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/ugorji/go/codec"
+	"github.com/hashicorp/go-msgpack/codec"
 )
 
 var (
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"bufio"
     	"fmt"
     	"github.com/hashicorp/logutils"
-    	"github.com/ugorji/go/codec"
+    	"github.com/hashicorp/go-msgpack/codec"
     	"log"
     	"net"
     	"sync"
@@ Expand Down @@