Merge pull request #6 from mailgun/thrawn/develop

Release Candidate RC2

CHANGELOG

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.0.0] - 2019-05-30
+## [2.0.0-rc.2] - 2019-06-03
 ### Changes
 * Now using golang standard `context.Context` instead of `groupcache.Context`.
 * HTTP requests made by `httpGetter` now respect `context.Context` done.
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Now always populating the hotcache. A more complex algorithm is unnecessary
   when the LRU cache will ensure the most used values remain in the cache. The
   evict code ensures the hotcache does not overcrowd the maincache.
+* Changed import paths to /v2 in accordance with go modules rules
 
 ## [1.3.0] - 2019-05-23
 ### Added

go.mod

@@ -1,3 +1,3 @@
-module github.com/mailgun/groupcache
+module github.com/mailgun/groupcache/v2
 
 require github.com/golang/protobuf v1.3.1

groupcache.go

@@ -32,9 +32,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	pb "github.com/mailgun/groupcache/groupcachepb"
-	"github.com/mailgun/groupcache/lru"
-	"github.com/mailgun/groupcache/singleflight"
+	pb "github.com/mailgun/groupcache/v2/groupcachepb"
+	"github.com/mailgun/groupcache/v2/lru"
+	"github.com/mailgun/groupcache/v2/singleflight"
 )
 
 // A Getter loads data for a key.

groupcache_test.go

@@ -31,8 +31,8 @@ import (
 
 	"github.com/golang/protobuf/proto"
 
-	pb "github.com/mailgun/groupcache/groupcachepb"
-	"github.com/mailgun/groupcache/testpb"
+	pb "github.com/mailgun/groupcache/v2/groupcachepb"
+	"github.com/mailgun/groupcache/v2/testpb"
 )
 
 var (

http.go

@@ -28,8 +28,8 @@ import (
 	"sync"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/mailgun/groupcache/consistenthash"
-	pb "github.com/mailgun/groupcache/groupcachepb"
+	"github.com/mailgun/groupcache/v2/consistenthash"
+	pb "github.com/mailgun/groupcache/v2/groupcachepb"
 )
 
 const defaultBasePath = "/_groupcache/"

peers.go

@@ -20,7 +20,7 @@ package groupcache
 
 import (
 	"context"
-	pb "github.com/mailgun/groupcache/groupcachepb"
+	pb "github.com/mailgun/groupcache/v2/groupcachepb"
 )
 
 // ProtoGetter is the interface that must be implemented by a peer.