Merge pull request #218 from nats-io/release_0_3_6

Release 0.3.6
nats-io · Dec 21, 2016 · d1102c4 · d1102c4
2 parents 45761d8 + eba80cd
commit d1102c4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/server/server.go b/server/server.go
@@ -31,7 +31,7 @@ import (
 // Server defaults.
 const (
 	// VERSION is the current version for the NATS Streaming server.
-	VERSION = "0.3.5"
+	VERSION = "0.3.6"
 
 	DefaultClusterID      = "test-cluster"
 	DefaultDiscoverPrefix = "_STAN.discover"

diff --git a/vendor/github.com/nats-io/gnatsd/server/const.go b/vendor/github.com/nats-io/gnatsd/server/const.go
diff --git a/vendor/github.com/nats-io/go-nats-streaming/stan.go b/vendor/github.com/nats-io/go-nats-streaming/stan.go
diff --git a/vendor/manifest b/vendor/manifest
@@ -41,8 +41,8 @@
 			"importpath": "github.com/nats-io/gnatsd",
 			"repository": "https://github.com/nats-io/gnatsd",
 			"vcs": "git",
-			"revision": "c39204b478b87f294d7b9149065bf5de0e1d685a",
-			"branch": "master",
+			"revision": "5dcad241bcd7fff3aac6e9f8b47350f071f5fd38",
+			"branch": "HEAD",
 			"notests": true
 		},
 		{
@@ -57,8 +57,8 @@
 			"importpath": "github.com/nats-io/go-nats-streaming",
 			"repository": "https://github.com/nats-io/go-nats-streaming",
 			"vcs": "git",
-			"revision": "eb937665d19aa9a1d72f4eedcf6f9302ef4120c1",
-			"branch": "master",
+			"revision": "6e620057a207bd61e992c1c5b6a2de7b6a4cb010",
+			"branch": "HEAD",
 			"notests": true
 		},
 		{