Merge branch 'master' into grpc-archive-storage

jaegertracing · Jun 29, 2020 · 055114c · 055114c
2 parents ae7b4f3 + 83fabe3
commit 055114c
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 63 deletions.
diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ SWAGGER_IMAGE=quay.io/goswagger/swagger:$(SWAGGER_VER)
 SWAGGER=docker run --rm -it -u ${shell id -u} -v "${PWD}:/go/src/" -w /go/src/ $(SWAGGER_IMAGE)
 SWAGGER_GEN_DIR=swagger-gen
 
-JAEGER_DOCKER_PROTOBUF=jaegertracing/protobuf:0.1.0
+JAEGER_DOCKER_PROTOBUF=jaegertracing/protobuf:0.2.0
 
 COLOR_PASS=$(shell printf "\033[32mPASS\033[0m")
 COLOR_FAIL=$(shell printf "\033[31mFAIL\033[0m")

diff --git a/idl b/idl
diff --git a/model/model.pb.go b/model/model.pb.go