Generated from 30ecc6996595e8e8fea4215fb88141aa787e4ebd (#1849) (#1852)

Merge branch 'master' into Network-2018-05-01 # Conflicts: # specification/network/resource-manager/readme.md
Azure · May 18, 2018 · f5820c8 · f5820c8
1 parent c52164e
commit f5820c8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 253 deletions.
diff --git a/profiles/preview/network/mgmt/network/models.go b/profiles/preview/network/mgmt/network/models.go
@@ -1115,11 +1115,9 @@ type VirtualNetworkGatewaysGenerateVpnProfileFuture = original.VirtualNetworkGat
 type VirtualNetworkGatewaysGetAdvertisedRoutesFuture = original.VirtualNetworkGatewaysGetAdvertisedRoutesFuture
 type VirtualNetworkGatewaysGetBgpPeerStatusFuture = original.VirtualNetworkGatewaysGetBgpPeerStatusFuture
 type VirtualNetworkGatewaysGetLearnedRoutesFuture = original.VirtualNetworkGatewaysGetLearnedRoutesFuture
-type VirtualNetworkGatewaysGetVpnclientIpsecParametersFuture = original.VirtualNetworkGatewaysGetVpnclientIpsecParametersFuture
 type VirtualNetworkGatewaysGetVpnProfilePackageURLFuture = original.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture
 type VirtualNetworkGatewaySku = original.VirtualNetworkGatewaySku
 type VirtualNetworkGatewaysResetFuture = original.VirtualNetworkGatewaysResetFuture
-type VirtualNetworkGatewaysSetVpnclientIpsecParametersFuture = original.VirtualNetworkGatewaysSetVpnclientIpsecParametersFuture
 type VirtualNetworkGatewaysUpdateTagsFuture = original.VirtualNetworkGatewaysUpdateTagsFuture
 type VirtualNetworkListResult = original.VirtualNetworkListResult
 type VirtualNetworkListResultIterator = original.VirtualNetworkListResultIterator

diff --git a/services/network/mgmt/2018-04-01/network/models.go b/services/network/mgmt/2018-04-01/network/models.go
diff --git a/services/network/mgmt/2018-04-01/network/virtualnetworkgateways.go b/services/network/mgmt/2018-04-01/network/virtualnetworkgateways.go