Merge branch 'master' into release-3.11.0

go.mod

@@ -3,17 +3,15 @@ module go.aporeto.io/addedeffect
 go 1.12
 
 require (
-	go.aporeto.io/elemental v1.69.0
-	go.aporeto.io/gaia v1.8.0
-	go.aporeto.io/manipulate v1.77.0
-	go.aporeto.io/tg v1.20.0
+	go.aporeto.io/elemental v1.80.1
+	go.aporeto.io/gaia v1.21.0
+	go.aporeto.io/manipulate v1.84.0
+	go.aporeto.io/tg v1.23.0
 )
 
 require (
-	github.com/BurntSushi/toml v0.3.1
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
-	github.com/magefile/mage v1.8.0
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/smartystreets/assertions v1.0.0
 	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a
@@ -23,7 +21,5 @@ require (
 	github.com/uber/jaeger-client-go v2.16.0+incompatible
 	github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
 	go.uber.org/zap v1.10.0
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/tools v0.0.0-20190628203336-59bec042292d
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 )

go.sum

@@ -84,8 +84,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/magefile/mage v1.8.0 h1:mzL+xIopvPURVBwHG9A50JcjBO+xV3b5iZ7khFRI+5E=
-github.com/magefile/mage v1.8.0/go.mod h1:IUDi13rsHje59lecXokTfGX0QIzO45uVPlXnJYsXepA=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
@@ -173,16 +171,16 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:
 github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-go.aporeto.io/elemental v1.69.0 h1:sD9RfkXTXvzWrhbmA4t64vOiX7FIZTQa/GjbcSfwsYg=
-go.aporeto.io/elemental v1.69.0/go.mod h1:xX5qJw/YVFHh5F7PzvMVGROL328R1RzXWeLZD2l1j5k=
-go.aporeto.io/gaia v1.8.0 h1:riJQX/mDe5W/vFBBb3SUf9uLQ4JD56TjtPh904t5N1Y=
-go.aporeto.io/gaia v1.8.0/go.mod h1:p0K7LbVHNv5kYicyLVeWU2UN3MqGiiK+E2EAQMBjM/4=
-go.aporeto.io/manipulate v1.77.0 h1:dG4Xc9JBg0OQC3mUiZ+GpYkFzt8yk4wZ8LzzfjM5RHM=
-go.aporeto.io/manipulate v1.77.0/go.mod h1:QxGkZVa0BrLNv4VUfP6ns6xGVBHhiJoWc1poWqiZC30=
-go.aporeto.io/regolithe v1.33.0/go.mod h1:n5Wi2kGXJ+eZe4fUTiVZ++RlgIo3DKiG71I7TV1Pfz4=
-go.aporeto.io/tg v1.20.0 h1:JjipIJIV/45QJhc3+kaAUNhB0sJ7RsqmWPkkTxShdnw=
-go.aporeto.io/tg v1.20.0/go.mod h1:t9IL2iIzj9902gGj+nc/rsowvDiTF5oQvRn+2srFGhg=
-go.aporeto.io/wsc v1.27.0/go.mod h1:RtLQspKU7si9US0WNw8RnOy70R+ep0MKjhLtvfRKIb0=
+go.aporeto.io/elemental v1.80.1 h1:wLukLKl3iWxhex4miSUffzXcDIJsEUjs0/KJ/nmBTh4=
+go.aporeto.io/elemental v1.80.1/go.mod h1:hsCdspEFXOqFj4OhtzJfOAbF7SI1vm5VN7IlYwfA2C0=
+go.aporeto.io/gaia v1.21.0 h1:WPaje2ZrAuiEeGtqswismRFmn3G6/EAooyXf6rxExRU=
+go.aporeto.io/gaia v1.21.0/go.mod h1:XLbgLVkZETMCm1D3fi9+F16p7exrtFHOQ4k8IhMe5U0=
+go.aporeto.io/manipulate v1.84.0 h1:fWLk0+MPsmIGM+C7WW3eiBMPWLidzdZTpQngZAHimAA=
+go.aporeto.io/manipulate v1.84.0/go.mod h1:ylDFrVfZSbhUHm+S6R6Rr2VxQx/BR28/IiJmueUldss=
+go.aporeto.io/regolithe v1.38.1/go.mod h1:n5Wi2kGXJ+eZe4fUTiVZ++RlgIo3DKiG71I7TV1Pfz4=
+go.aporeto.io/tg v1.23.0 h1:EWptls4Uts2R4gRr19kVfYXmc1E9Ri5klDSW25dO1/0=
+go.aporeto.io/tg v1.23.0/go.mod h1:t9IL2iIzj9902gGj+nc/rsowvDiTF5oQvRn+2srFGhg=
+go.aporeto.io/wsc v1.28.1/go.mod h1:RtLQspKU7si9US0WNw8RnOy70R+ep0MKjhLtvfRKIb0=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -236,8 +234,6 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190628185430-d5de6b6fc58b h1:fEg+YfwwddMzIL+qAoLNdTNRUzQbdYYCyzmq1nafLXM=
 golang.org/x/tools v0.0.0-20190628185430-d5de6b6fc58b/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
-golang.org/x/tools v0.0.0-20190628203336-59bec042292d h1:RtaWpMdeKym+Oo6oUkFrpD6kQnHNmWYXcsQYfsQ2MJ8=
-golang.org/x/tools v0.0.0-20190628203336-59bec042292d/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=