Merge branch 'beorn7/storage6' into beorn7/storage7

This commit is contained in:
beorn7 2016-03-09 00:50:33 +01:00
commit bbd34d7ccf

View file

@ -21,7 +21,7 @@ version=$( cat version/VERSION )
revision=$( git rev-parse --short HEAD 2> /dev/null || echo 'unknown' )
branch=$( git rev-parse --abbrev-ref HEAD 2> /dev/null || echo 'unknown' )
host=$( hostname )
build_date=$( date +%Y%m%d-%H:%M:%S )
build_date=$( TZ=UTC date +%Y%m%d-%H:%M:%S )
go_version=$( go version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/' )
if [ "$(go env GOOS)" = "windows" ]; then