Merge pull request #1324 from nats-io/release_2_1_6

Release v2.1.6

README.md

@@ -29,8 +29,8 @@ If you are interested in contributing to NATS, read about our...
 [Fossa-Image]: https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnats-io%2Fgnatsd.svg?type=shield
 [Build-Status-Url]: https://travis-ci.org/nats-io/nats-server
 [Build-Status-Image]: https://travis-ci.org/nats-io/nats-server.svg?branch=master
-[Release-Url]: https://github.com/nats-io/nats-server/releases/tag/v2.1.4
-[Release-image]: https://img.shields.io/badge/release-v2.1.4-1eb0fc.svg
+[Release-Url]: https://github.com/nats-io/nats-server/releases/tag/v2.1.6
+[Release-image]: https://img.shields.io/badge/release-v2.1.6-1eb0fc.svg
 [Coverage-Url]: https://coveralls.io/r/nats-io/nats-server?branch=master
 [Coverage-image]: https://coveralls.io/repos/github/nats-io/nats-server/badge.svg?branch=master
 [ReportCard-Url]: https://goreportcard.com/report/nats-io/nats-server

docker/Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM golang:1.13.7-alpine3.11 AS builder
+FROM golang:1.13.9-alpine3.11 AS builder
 
 WORKDIR $GOPATH/src/github.com/nats-io/nats-server
 
@@ -10,7 +10,7 @@ COPY . .
 
 RUN CGO_ENABLED=0 GO111MODULE=off go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-server/server.gitCommit=`git rev-parse --short HEAD`" -o /nats-server
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 RUN apk add --update ca-certificates && mkdir -p /nats/bin && mkdir /nats/conf
 

server/const.go

@@ -40,7 +40,7 @@ var (
 
 const (
 	// VERSION is the current version for the server.
-	VERSION = "2.1.4"
+	VERSION = "2.1.6"
 
 	// PROTO is the currently supported protocol.
 	// 0 was the original

test/cluster_tls_test.go

@@ -52,15 +52,15 @@ func TestBasicTLSClusterPubSub(t *testing.T) {
 	sendA("PING\r\n")
 	expectA(pongRe)
 
+	if err := checkExpectedSubs(1, srvA, srvB); err != nil {
+		t.Fatalf("%v", err)
+	}
+
 	sendB, expectB := setupConn(t, clientB)
 	sendB("PUB foo 2\r\nok\r\n")
 	sendB("PING\r\n")
 	expectB(pongRe)
 
-	if err := checkExpectedSubs(1, srvA, srvB); err != nil {
-		t.Fatalf("%v", err)
-	}
-
 	expectMsgs := expectMsgsCommand(t, expectA)
 
 	matches := expectMsgs(1)

test/new_routes_test.go

@@ -820,6 +820,11 @@ func TestNewRouteQueueSubsDistribution(t *testing.T) {
 	sendB("PING\r\n")
 	expectB(pongRe)
 
+	// Each server should have its 100 local subscriptions, plus 1 for the route.
+	if err := checkExpectedSubs(101, srvA, srvB); err != nil {
+		t.Fatal(err.Error())
+	}
+
 	sender := createClientConn(t, optsA.Host, optsA.Port)
 	defer sender.Close()
 	send, expect := setupConn(t, sender)