Skip to content

Commit

Permalink
Merge branch 'latest' into restapi_auto_web/resource-manager
Browse files Browse the repository at this point in the history
  • Loading branch information
jhendrixMSFT authored Aug 22, 2018
2 parents 2c713b8 + b5f5cc8 commit 4935ccb
Show file tree
Hide file tree
Showing 31 changed files with 13,524 additions and 157 deletions.
4 changes: 0 additions & 4 deletions profiles/latest/cognitiveservices/contentmoderator/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ const (
type Address = original.Address
type APIError = original.APIError
type Body = original.Body
type BodyMetadata = original.BodyMetadata
type BodyModel = original.BodyModel
type Candidate = original.Candidate
type Classification = original.Classification
Expand Down Expand Up @@ -73,7 +72,6 @@ type Image = original.Image
type ImageAdditionalInfoItem = original.ImageAdditionalInfoItem
type ImageIds = original.ImageIds
type ImageList = original.ImageList
type ImageListMetadata = original.ImageListMetadata
type IPA = original.IPA
type Job = original.Job
type JobExecutionReportDetails = original.JobExecutionReportDetails
Expand All @@ -89,7 +87,6 @@ type OCR = original.OCR
type Phone = original.Phone
type PII = original.PII
type RefreshIndex = original.RefreshIndex
type RefreshIndexAdvancedInfoItem = original.RefreshIndexAdvancedInfoItem
type Review = original.Review
type Screen = original.Screen
type SetObject = original.SetObject
Expand All @@ -98,7 +95,6 @@ type Status = original.Status
type String = original.String
type Tag = original.Tag
type TermList = original.TermList
type TermListMetadata = original.TermListMetadata
type Terms = original.Terms
type TermsData = original.TermsData
type TermsInList = original.TermsInList
Expand Down
2 changes: 0 additions & 2 deletions profiles/latest/compute/mgmt/compute/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,6 @@ const (
)

type AccessURI = original.AccessURI
type AccessURIOutput = original.AccessURIOutput
type AccessURIRaw = original.AccessURIRaw
type AdditionalUnattendContent = original.AdditionalUnattendContent
type APIEntityReference = original.APIEntityReference
type APIError = original.APIError
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ type CapacitiesDeleteFuture = original.CapacitiesDeleteFuture
type CapacitiesResumeFuture = original.CapacitiesResumeFuture
type CapacitiesSuspendFuture = original.CapacitiesSuspendFuture
type CapacitiesUpdateFuture = original.CapacitiesUpdateFuture
type CheckCapacityNameAvailabilityParameters = original.CheckCapacityNameAvailabilityParameters
type CheckCapacityNameAvailabilityResult = original.CheckCapacityNameAvailabilityResult
type DedicatedCapacities = original.DedicatedCapacities
type DedicatedCapacity = original.DedicatedCapacity
type DedicatedCapacityAdministrators = original.DedicatedCapacityAdministrators
Expand Down
13 changes: 2 additions & 11 deletions profiles/preview/batch/batch/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package batch

import original "github.com/Azure/azure-sdk-for-go/services/batch/2018-03-01.6.1/batch"
import original "github.com/Azure/azure-sdk-for-go/services/batch/2018-08-01.7.0/batch"

type AccountClient = original.AccountClient
type ApplicationClient = original.ApplicationClient
Expand Down Expand Up @@ -321,13 +321,6 @@ const (
TaskAddStatusSuccess TaskAddStatus = original.TaskAddStatusSuccess
)

type TaskCountValidationStatus = original.TaskCountValidationStatus

const (
Unvalidated TaskCountValidationStatus = original.Unvalidated
Validated TaskCountValidationStatus = original.Validated
)

type TaskExecutionResult = original.TaskExecutionResult

const (
Expand Down Expand Up @@ -437,6 +430,7 @@ type MultiInstanceSettings = original.MultiInstanceSettings
type NameValuePair = original.NameValuePair
type NetworkConfiguration = original.NetworkConfiguration
type NetworkSecurityGroupRule = original.NetworkSecurityGroupRule
type NodeAgentInformation = original.NodeAgentInformation
type NodeAgentSku = original.NodeAgentSku
type NodeCounts = original.NodeCounts
type NodeDisableSchedulingParameter = original.NodeDisableSchedulingParameter
Expand Down Expand Up @@ -663,9 +657,6 @@ func PossibleSubtaskStateValues() []SubtaskState {
func PossibleTaskAddStatusValues() []TaskAddStatus {
return original.PossibleTaskAddStatusValues()
}
func PossibleTaskCountValidationStatusValues() []TaskCountValidationStatus {
return original.PossibleTaskCountValidationStatusValues()
}
func PossibleTaskExecutionResultValues() []TaskExecutionResult {
return original.PossibleTaskExecutionResultValues()
}
Expand Down
4 changes: 0 additions & 4 deletions profiles/preview/cognitiveservices/contentmoderator/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ const (
type Address = original.Address
type APIError = original.APIError
type Body = original.Body
type BodyMetadata = original.BodyMetadata
type BodyModel = original.BodyModel
type Candidate = original.Candidate
type Classification = original.Classification
Expand Down Expand Up @@ -73,7 +72,6 @@ type Image = original.Image
type ImageAdditionalInfoItem = original.ImageAdditionalInfoItem
type ImageIds = original.ImageIds
type ImageList = original.ImageList
type ImageListMetadata = original.ImageListMetadata
type IPA = original.IPA
type Job = original.Job
type JobExecutionReportDetails = original.JobExecutionReportDetails
Expand All @@ -89,7 +87,6 @@ type OCR = original.OCR
type Phone = original.Phone
type PII = original.PII
type RefreshIndex = original.RefreshIndex
type RefreshIndexAdvancedInfoItem = original.RefreshIndexAdvancedInfoItem
type Review = original.Review
type Screen = original.Screen
type SetObject = original.SetObject
Expand All @@ -98,7 +95,6 @@ type Status = original.Status
type String = original.String
type Tag = original.Tag
type TermList = original.TermList
type TermListMetadata = original.TermListMetadata
type Terms = original.Terms
type TermsData = original.TermsData
type TermsInList = original.TermsInList
Expand Down
1 change: 1 addition & 0 deletions profiles/preview/compute/mgmt/compute/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,7 @@ type VirtualMachineScaleSetPublicIPAddressConfiguration = original.VirtualMachin
type VirtualMachineScaleSetPublicIPAddressConfigurationDNSSettings = original.VirtualMachineScaleSetPublicIPAddressConfigurationDNSSettings
type VirtualMachineScaleSetPublicIPAddressConfigurationProperties = original.VirtualMachineScaleSetPublicIPAddressConfigurationProperties
type VirtualMachineScaleSetRollingUpgradesCancelFuture = original.VirtualMachineScaleSetRollingUpgradesCancelFuture
type VirtualMachineScaleSetRollingUpgradesStartExtensionUpgradeFuture = original.VirtualMachineScaleSetRollingUpgradesStartExtensionUpgradeFuture
type VirtualMachineScaleSetRollingUpgradesStartOSUpgradeFuture = original.VirtualMachineScaleSetRollingUpgradesStartOSUpgradeFuture
type VirtualMachineScaleSetsCreateOrUpdateFuture = original.VirtualMachineScaleSetsCreateOrUpdateFuture
type VirtualMachineScaleSetsDeallocateFuture = original.VirtualMachineScaleSetsDeallocateFuture
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ type CapacitiesDeleteFuture = original.CapacitiesDeleteFuture
type CapacitiesResumeFuture = original.CapacitiesResumeFuture
type CapacitiesSuspendFuture = original.CapacitiesSuspendFuture
type CapacitiesUpdateFuture = original.CapacitiesUpdateFuture
type CheckCapacityNameAvailabilityParameters = original.CheckCapacityNameAvailabilityParameters
type CheckCapacityNameAvailabilityResult = original.CheckCapacityNameAvailabilityResult
type DedicatedCapacities = original.DedicatedCapacities
type DedicatedCapacity = original.DedicatedCapacity
type DedicatedCapacityAdministrators = original.DedicatedCapacityAdministrators
Expand Down
1 change: 1 addition & 0 deletions profiles/preview/preview/signalr/mgmt/signalr/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ type CreateOrUpdateFuture = original.CreateOrUpdateFuture
type CreateOrUpdateProperties = original.CreateOrUpdateProperties
type CreateParameters = original.CreateParameters
type DeleteFuture = original.DeleteFuture
type Dimension = original.Dimension
type Keys = original.Keys
type MetricSpecification = original.MetricSpecification
type NameAvailability = original.NameAvailability
Expand Down
Loading

0 comments on commit 4935ccb

Please sign in to comment.