mirror of https://github.com/poanetwork/quorum.git
merge with upstream/master
This commit is contained in:
commit
8c339adc6c
|
@ -1,7 +1,3 @@
|
|||
**/.git
|
||||
.git
|
||||
!.git/HEAD
|
||||
!.git/refs/heads
|
||||
**/*_test.go
|
||||
|
||||
build/_workspace
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Build Geth in a stock Go builder container
|
||||
FROM golang:1.10-alpine as builder
|
||||
|
||||
RUN apk add --no-cache make gcc musl-dev linux-headers
|
||||
RUN apk add --no-cache make gcc musl-dev linux-headers git
|
||||
|
||||
ADD . /go-ethereum
|
||||
RUN cd /go-ethereum && make geth bootnode
|
||||
|
|
|
@ -28,7 +28,7 @@ const (
|
|||
|
||||
QuorumVersionMajor = 2
|
||||
QuorumVersionMinor = 1
|
||||
QuorumVersionPatch = 0
|
||||
QuorumVersionPatch = 1
|
||||
)
|
||||
|
||||
// Version holds the textual version string.
|
||||
|
|
Loading…
Reference in New Issue