Merge branch 'master' of github.com:/golang/groupcache

feixiao · Aug 12, 2013 · b912ed8 · b912ed8
2 parents 3f89d3e + 9db4a8a
commit b912ed8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -52,11 +52,11 @@ In a nutshell, a groupcache lookup of **Get("foo")** looks like:
 
  3. Amongst all the peers in my set of N, am I the owner of the key
  "foo"? (e.g. does it consistent hash to 5?) If so, load it. If
- other callers come in (via the same process or via RPC requests
+ other callers come in, via the same process or via RPC requests
  from peers, they block waiting for the load to finish and get the
- same answer). If not, RPC to the peer that's the owner and get
+ same answer. If not, RPC to the peer that's the owner and get
  the answer. If the RPC fails, just load it locally (still with
- local dup suppresion).
+ local dup suppression).
 
 ## Users
 

diff --git a/groupcache.pb.go b/groupcache.pb.go
diff --git a/peers.go b/peers.go
@@ -54,7 +54,7 @@ var (
 // It is called once, when the first group is created.
 func RegisterPeerPicker(fn func() PeerPicker) {
  if portPicker != nil {
- panic("RegisterInitPeers called more than once")
+ panic("RegisterPeerPicker called more than once")
  }
  portPicker = fn
 }