diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-06-12 11:48:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 11:48:38 +0200 |
| commit | 23d9213d4f58410cd78410dc10950b3bab86c563 (patch) | |
| tree | 68f4e14449fe5581fde1a950380286c3d973e3f5 /storage | |
| parent | 49ea989662f402f6c96737636b497724a4bb457f (diff) | |
| parent | 06d3ba8c9e0edea16dafce70c13280330c4ab59f (diff) | |
Merge branch 'master' into balder/reduce-code-visibility-rebased
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/.gitignore | 1 | ||||
| -rw-r--r-- | storage/src/versiontag.mak | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/storage/src/.gitignore b/storage/src/.gitignore index f7cecb195ca..4bb2c3395eb 100644 --- a/storage/src/.gitignore +++ b/storage/src/.gitignore @@ -7,4 +7,3 @@ Makefile.ini config_command.sh project.dsw -/storage.mak diff --git a/storage/src/versiontag.mak b/storage/src/versiontag.mak deleted file mode 100644 index b01f54a9446..00000000000 --- a/storage/src/versiontag.mak +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -VTAG := $(shell $(VESPALIB_DIR)/bin/getversion -D $(TOP) ) - -ifneq (X$(SPECIFIED_VTAG),XDISABLE) - VTAG += -DV_TAG='"$(SPECIFIED_VTAG)"' -endif |