Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RI from upstream/master into origin/release #75

Merged
merged 54 commits into from
Sep 29, 2015
Merged

RI from upstream/master into origin/release #75

merged 54 commits into from
Sep 29, 2015

Conversation

dragonfly91
Copy link

RI from upstream/master into origin/release

gucalder and others added 30 commits April 8, 2015 12:18
@gucalder
FW: Fixing the documentation of the properties in the generated code …
cee2328 
…(from the Hydra spec)
@george-moussa
FW: [Sdk] Rename skuDefinitions to skus
83d9cec
@george-moussa
WORK: 3595593: [Sdk] Add Milliseconds unit
e73d650
@george-moussa
WORK: 3644439: [Sdk][Sku] Remove antares workarounds
af3411d
@george-moussa
Revert "WORK: 3644439: [Sdk][Sku] Remove antares workarounds"
2bea3c9 
This reverts commit af3411d.
@davmc
WORK: 3587839 [SDK] Support storage analytic metric schema natively i…
0c8adf7 
…n Insights SDK to remove dependency on on legacy infra
@davmc
Update SDK version
4c18888
@davmc
Fix exception due to TIMESTAMP field type
2c8e250
@george-moussa
WORK: 3644439: [Sdk][Sku] Remove antares workarounds
f94730e
@jagadisk
Azure SDK changes for the hydra changes
f0ab40d 
Bugs:
3580751 : [SDK] Phase 1 - Rename methods with EventSource -> Category and use api-version = 2015-05-01
3593276 : [SDK] Deprecate Summary APIs from SDK
3593213 : [SDK] Event Service - Support querying by ResourceType
@jagadisk
Revert "WORK: 3587839 [SDK] Support storage analytic metric schema na…
d06a022 
…tively in Insights SDK to remove dependency on on legacy infra"

This reverts commit 0c8adf7.
@jagadisk
Update the SDK version to 0.8.2
b892a27
@jagadisk
Revert "Revert "WORK: 3587839 [SDK] Support storage analytic metric s…
9da58c3 
…chema natively in Insights SDK to remove dependency on on legacy infra""

This reverts commit d06a022.
@jagadisk
Reverting the revert of the storage analytics.
75a43b8
@vcanaa
GetMetrics query instance metrics when they are present and aggregate…
5479fab 
… on the fly
@vcanaa
Increase Insights version to 0.8.4.0
c962957
@jagadisk
1. API to get the event categories
bbcff80 
2. API to get the tenant level events.
@jagadisk
Including the model classes in the project.
124f3d0
@jagadisk
Update the version to 0.8.5-preview
8a322a6
@davmc
API to get Tenant-level events
8783495
@vcanaa
Removing files that are not referenced
97a96d2
@vcanaa
Keeping OnetimeGenerated structure the same as generated
a41bf6d
@george-moussa
WORK: 4057941: [Lastest Sku contract][Sdk] Part1: Update non-breaking…
57109e4 
… changes
@vcanaa
Fix timestamp parsing in shoebox metrics
82ee5a8
@vcanaa
[ShoeboxV2] MetricsDefinitionsOperations and MetricsOperations
773fa54
@vcanaa
[ShoeboxV2] Fix null pointer exception when aggregating the data from…
1ae410b 
… blobs
@davmc
Disable encoding for GetMetrics (Generated files)
3a32541
@jagadisk
BUG: 4305815 : [SDK][legacy passthrough] move towards using extension…
3a95b1d 
…s model for metric/metricdefinition
@george-moussa
WORK: 4057941: [SDK][Generic autoscale] Ensure generic autoscale supp…
3dc38c9 
…orts the latest SKU API in CSM RP doc
@davmc
Merge remote-tracking branch 'origin/dev' into dev
bf9fcbe 
Conflicts:
	src/Insights/Generated/Insights/MetricOperations.cs
	src/Insights/OnetimeGenerated/Insights/MetricDefinitionOperations.cs
	src/Insights/OnetimeGenerated/MetricDefinitionOperations.cs

Disable encoding resourceUri for get metrics, metricDefinitions
davmc and others added 24 commits August 28, 2015 16:20
@davmc
BUG: 4390874 [SDK] Add missing Id field to UsageMetric
8a7b436 
Generated files
@jagadisk
BUG: 4486642 : [ShoeboxV1] Make sure that the new sdk with extensions…
c66ee16 
… works for shoeboxv1
@jagadisk
Version increment
858e324
@LeoVannelli
Adding support for webhook actions to the Alert sdk
aafa708
@jagadisk
BUG: Call to get the metric definition fails.
a1a6377
@jagadisk
BUG: Call to get the metric definition fails.
77fd924
@jagadisk
Merge branch 'dev' of https://github.com/AuxMon/azure-sdk-for-net int…
b07d61f 
…o dev
@jagadisk
Merge branch 'dev' into shoeboxv2
db53eb4 
Conflicts:
	src/Insights/Microsoft.Azure.Insights.nuget.proj
	src/Insights/OnetimeGenerated/Insights/MetricDefinitionOperations.cs
	src/Insights/OnetimeGenerated/Insights/MetricOperations.cs
@jagadisk
Removing the duplicate entries in the csproj (due to merge conflicts)
02be46b
@jagadisk
Update the version
dc94348
@jagadisk
Update the version
5bbd18c
@jagadisk
Merge branch 'dev'
829dca6 
Conflicts:
	src/Insights/Customizations/MetricDefinitionOperations.Customization.cs
	src/Insights/Customizations/MetricOperations.Customization.cs
	src/Insights/Customizations/Shoebox/FilterDimension.cs
	src/Insights/Customizations/Shoebox/MetricFilterDimension.cs
	src/Insights/Customizations/Sku/SkuOperationsExtensions.Customizations.cs
	src/Insights/Generated/Insights/ILogOperations.cs
	src/Insights/Generated/Insights/Models/BlobLocation.cs
	src/Insights/Generated/Insights/Models/EventCategoryCollection.cs
	src/Insights/Generated/Insights/Models/EventCategoryListResponse.cs
	src/Insights/Generated/Insights/Models/EventStatusCountSummaryItem.cs
	src/Insights/Generated/Insights/Models/EventStatusCountSummaryItemCollection.cs
	src/Insights/Generated/Insights/Models/EventStatusCountSummaryListResponse.cs
	src/Insights/Generated/Insights/Models/Log.cs
	src/Insights/Generated/Insights/Models/LogCollection.cs
	src/Insights/Generated/Insights/Models/LogDefinitionCollection.cs
	src/Insights/Generated/Insights/Models/LogListResponse.cs
	src/Insights/Generated/Insights/Models/StatusCount.cs
	src/Insights/Generated/Management/Insights/AgentDiagnosticSettingsOperations.cs
	src/Insights/Generated/Management/Insights/Models/AntaresSku.cs
	src/Insights/Generated/Management/Insights/Models/AntaresSkuGetResponse.cs
	src/Insights/Generated/Management/Insights/Models/AntaresSkuUpdateRequest.cs
	src/Insights/Generated/Management/Insights/Models/Display.cs
	src/Insights/Generated/Management/Insights/Models/LogSettings.cs
	src/Insights/Generated/Management/Insights/Models/MetricSettings.cs
	src/Insights/Generated/Management/Insights/Models/RetentionPolicy.cs
	src/Insights/Generated/Management/Insights/SkuOperationsExtensions.cs
	src/Insights/Generated/Management/Insights/StorageDiagnosticSettingsOperations.cs
	src/Insights/Insights.csproj
	src/Insights/OnetimeGenerated/Insights/MetricOperations.cs
	src/Insights/OnetimeGenerated/Management/AgentDiagnosticSettingsOperations.cs
	src/Insights/OnetimeGenerated/Management/StorageDiagnosticSettingsOperations.cs
	src/Insights/OnetimeGenerated/MetricDefinitionOperations.cs
	src/Insights/OnetimeGenerated/Sku/AntaresSku.cs
	src/Insights/OnetimeGenerated/Sku/AntaresSkuGetResponse.cs
	src/Insights/OnetimeGenerated/Sku/AntaresSkuUpdateRequest.cs
	src/ResourceManagement/Insights/Insights.Tests/Customizations/InsightsClient.ListStatusCountSummaryItemsParameters.Customization.cs
	src/ResourceManagement/Insights/Insights/Customizations/EventStatusCountSummaryListResponse.Customizations.cs
	src/ResourceManagement/Insights/Insights/Customizations/Shoebox/FilterDimension.cs
	src/ResourceManagement/Insights/Insights/Customizations/Sku/ISkuOperations.Customizations.cs
	src/ResourceManagement/Insights/Insights/Customizations/Sku/SkuOperations.Antares.Customizations.cs
	src/ResourceManagement/Insights/Insights/Customizations/Sku/SkuOperations.Customizations.cs
	src/ResourceManagement/Insights/Insights/Customizations/Sku/SkuOperationsExtensions.Customizations.cs
	src/ResourceManagement/Insights/Insights/Generated/Insights/Models/EventStatusCountSummaryItem.cs
	src/ResourceManagement/Insights/Insights/Generated/Insights/Models/EventStatusCountSummaryItemCollection.cs
	src/ResourceManagement/Insights/Insights/Generated/Insights/Models/EventStatusCountSummaryListResponse.cs
	src/ResourceManagement/Insights/Insights/Generated/Insights/Models/StatusCount.cs
	src/ResourceManagement/Insights/Insights/Generated/Management/Insights/AgentDiagnosticSettingsOperations.cs
	src/ResourceManagement/Insights/Insights/Generated/Management/Insights/Models/AntaresSku.cs
	src/ResourceManagement/Insights/Insights/Generated/Management/Insights/Models/AntaresSkuGetResponse.cs
	src/ResourceManagement/Insights/Insights/Generated/Management/Insights/Models/AntaresSkuUpdateRequest.cs
	src/ResourceManagement/Insights/Insights/Generated/Management/Insights/Models/Display.cs
	src/ResourceManagement/Insights/Insights/Generated/Management/Insights/StorageDiagnosticSettingsOperations.cs
	src/ResourceManagement/Insights/Insights/OnetimeGenerated/Sku/AntaresSku.cs
	src/ResourceManagement/Insights/Insights/OnetimeGenerated/Sku/AntaresSkuGetResponse.cs
	src/ResourceManagement/Insights/Insights/OnetimeGenerated/Sku/AntaresSkuUpdateRequest.cs
	src/ResourceManagement/Insights/Insights/OnetimeGenerated/Sku/SkuOperations.cs
@jagadisk
Remove the code from the old location
327f123
@jagadisk
Overwriting the Insights folder with the latest from the dev branch
7506cde
@jagadisk
Fix build break with pragma; Account for types supported by AppInsights
9dc40aa
@jagadisk
Removing event tests that are not relavant.
0fa6cda 
Fixing build errors in the test project
@jagadisk
Refreshing the SDK with the latest hydra generated files
8ff3568
@brjohnstmsft
Search SDK: Removing dependency on JsonConvert.DefaultSettings
82adfdc 
This fixes issue: #1438
In one case, we were calling JsonConvert.DeserializeObject without passing in
JsonSerializerSettings. However, just adding the settings wasn't sufficient to
completely fix the issue because JsonConvert merges some of the settings with
the defaults. The solution was to roll our own DeserializeObject and
SerializeObject methods that ignore JsonConvert.DefaultSettings.
@jagadisk
Increment the SDK version
3a880ab
@vivsriaus
Add ListLocations to subscriptions client
a9d90be
Merge pull request #1451 from brjohnstmsft/jsonfix-pr
f849555 
Search SDK: Removing dependency on JsonConvert.DefaultSettings
Merge pull request #1452 from vivsriaus/master
21db6e5 
Add ListLocations to subscriptions client
@ogail
Merge pull request #1454 from MabOneSdk/release
7eb1056 
AzureBackup support for backend
@stankovski
Merge pull request #1456 from AuxMon/master
2cc2860 
Latest changes for the Insights SDK
dragonfly91 pushed a commit that referenced this pull request Sep 29, 2015
Merge pull request #75 from Azure/master
e9cf24a 
RI from upstream/master into origin/release
@dragonfly91 dragonfly91 merged commit e9cf24a into MabOneSdk:release Sep 29, 2015
dragonfly91 pushed a commit that referenced this pull request Oct 6, 2015
@shefaliv
Merge pull request #75 from chuanboz/ObjectDictionary
487da33 
fix issue Azure#996 to add Object dictionary support
dragonfly91 pushed a commit that referenced this pull request Aug 26, 2016
@huangpf
Merge pull request #75 from Azure/AutoRest
a4dc9f1 
Auto rest
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.