From 76c57f55cacb7916ca451e378d181b1c30c94032 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 10 Jan 2019 15:40:56 -0500 Subject: Revert "Merge pull request #1235 from mheon/shm_locking" This reverts commit bf5f779331870d31863c486619daae3fcea458eb, reversing changes made to 6868b5aa1444404113bc6a4582203fbbf89490c2. Signed-off-by: Matthew Heon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c672fd947..de4049cb4 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,7 @@ localunit: test/goecho/goecho varlink_generate ginkgo: ginkgo -v -tags "$(BUILDTAGS)" -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/. -localintegration: varlink_generate test-binaries ginkgo +localintegration: varlink_generate test-binaries clientintegration ginkgo localsystem: .install.ginkgo .install.gomega ginkgo -v -noColor test/system/ -- cgit v1.2.3-54-g00ecf From bffd2f50c312109d4728373b60215cf03ffcfdf1 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 10 Jan 2019 15:42:04 -0500 Subject: Update gitvalidation to avoid reverts w/o signoffs Signed-off-by: Matthew Heon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index de4049cb4..6a3f18a10 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GO ?= go DESTDIR ?= / -EPOCH_TEST_COMMIT ?= e1732a5213147e3c0b7bf60b55a332c3720ecb4b +EPOCH_TEST_COMMIT ?= 76c57f55cacb7916ca451e378d181b1c30c94032 HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD -- cgit v1.2.3-54-g00ecf