self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 02:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ev/rt

Browse source
This commit is contained in:
Ev Kontsevoy 2016-06-29 20:10:57 -07:00
parent b7c270ccb3 efd19db1d3
commit 8e1acd1fca
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -2,7 +2,7 @@
# Naming convention:
# for stable releases we use "1.0.0" format
# for pre-releases, we use "1.0.0-beta.2" format
VERSION=1.0.0
VERSION=1.0.1-beta.1
# These are standard autotools variables, don't change them please
BUILDDIR ?= build

2
version.go
View file

@ -2,7 +2,7 @@
package teleport
const (
Version = "1.0.0"
Version = "1.0.1-beta.1"
)
var Gitref string

4
version.mk
View file

@ -16,5 +16,5 @@ func init() { Gitref = \"$(GITREF)\"} "
#
.PHONY:setver
setver:
@echo $(VERSION_GO) | gofmt > version.go
@echo $(GITREF_GO) | gofmt > gitref.go
@printf $(VERSION_GO) | gofmt > version.go
@printf $(GITREF_GO) | gofmt > gitref.go