Antoni Rościszewski c8498527ee Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	dependencies/service/service.go
#	mocks/daemonset.go
#	mocks/pod.go
2017-02-13 12:48:28 +01:00
..
2017-02-01 23:07:24 +01:00