Skip to content

Commit ad7113e

Browse files
mostologmostolog
committed
Merge branch 'master' into patch-1
Signed-off-by: mostolog <[email protected]>
2 parents 9f5514b + 3a4a600 commit ad7113e

File tree

1,353 files changed

+77059
-33896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,353 files changed

+77059
-33896
lines changed

‎Dockerfile.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.5.4
1+
FROM golang:1.7.1
22
RUN apt-get update && apt-get -y install iptables
33

44
RUN go get github.com/tools/godep \

0 commit comments

Comments
 (0)