Merge branch 'release-1.15.4.3' into stable

NVIDIA · Feb 24, 2020 · c6ee254 · c6ee254
2 parents 57910b0 + a934385
commit c6ee254
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -145,6 +145,7 @@ clean:
 
 cover:
 	@set -e; \
+	go get -u github.com/ory/go-acc; \
 	go-acc -o coverage.coverprofile $(gosubdirspathsforci)
 
 fmt:
@@ -178,7 +179,6 @@ install:
 pre-generate:
 	@set -e; \
 	go install github.com/swiftstack/ProxyFS/vendor/golang.org/x/tools/cmd/stringer; \
-	go install github.com/ory/go-acc; \
 	for gosubdir in $(gopregeneratesubdirs); do \
 		$(MAKE) --no-print-directory -C $$gosubdir install; \
 	done

diff --git a/release_notes.md b/release_notes.md
@@ -1,6 +1,6 @@
 # ProxyFS Release Notes
 
-## 1.15.4.2 (February 24, 2020)
+## 1.15.4.3 (February 24, 2020)
 
 Fixed hangs in PFSAgent hit under heavy write loads.