Net40 0.47 influxdb1x #135
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: Src/Metrics.Tests/packages.config
Conflicts: Samples/NancyFx.Sample/packages.config Src/Adapters/Owin.Metrics/packages.config Src/Metrics.Tests/packages.config
Conflicts: Publishing/push-nuget.bat SharedAssemblyInfo.cs
Conflicts: Publishing/push-nuget.bat Src/Metrics.Tests/OwinAdapter/OwinMetricsTestData.cs Src/Metrics.Tests/OwinAdapter/OwinMiddlewareTests.cs Src/Metrics/Utils/ActionScheduler.cs
Conflicts: Publishing/push-nuget.bat Src/Metrics.Tests/packages.config Src/Metrics/Utils/ActionScheduler.cs
Conflicts: Publishing/push-nuget.bat SharedAssemblyInfo.cs
Conflicts: Publishing/push-nuget.bat SharedAssemblyInfo.cs Src/Metrics.Tests/OwinAdapter/OwinMiddlewareTests.cs create-nuget.bat
Conflicts: create-nuget.bat
Conflicts: Publishing/push-nuget.bat Samples/Owin.Sample/App.config Samples/Owin.Sample/Program.cs Src/Metrics.Tests/OwinAdapter/OwinMiddlewareTests.cs Src/Metrics.Tests/app.config Src/Metrics/RemoteMetrics/RemoteMetricsContext.cs Src/Metrics/Visualization/MetricsHttpListener.cs
Conflicts: Publishing/push-nuget.bat SharedAssemblyInfo.cs
Conflicts: Publishing/push-nuget.bat SharedAssemblyInfo.cs
Conflicts: Publishing/push-nuget.bat SharedAssemblyInfo.cs
Conflicts: Publishing/push-nuget.bat Samples/Metrics.SampleReporter/packages.config Samples/Metrics.SamplesConsole/App.config Samples/Owin.Sample/App.config Samples/Owin.Sample/Owin.Sample.csproj Samples/Owin.Sample/packages.config SharedAssemblyInfo.cs Src/Adapters/Metrics.NLog/packages.config Src/Adapters/Nancy.Metrics/packages.config Src/Metrics.Tests/packages.config Src/Metrics/Utils/ActionScheduler.cs Src/Metrics/Visualization/MetricsHttpListener.cs create-nuget.bat
Conflicts: Publishing/push-nuget.bat Src/Metrics/Visualization/MetricsHttpListener.cs
Conflicts: Publishing/push-nuget.bat Src/Metrics.Tests/packages.config
Conflicts: Publishing/push-nuget.bat Src/Metrics.Tests/OwinAdapter/OwinMiddlewareTests.cs Src/Metrics.Tests/packages.config
Conflicts: Src/Metrics.Tests/packages.config create-nuget.bat
Conflicts: Publishing/push-nuget.bat Src/Adapters/Metrics.NLog/packages.config Src/Adapters/Nancy.Metrics/packages.config Src/Metrics.Tests/packages.config Src/Metrics/RemoteMetrics/RemoteMetricsContext.cs Src/Metrics/Utils/ActionScheduler.cs
Conflicts: Publishing/push-nuget.bat
All related code are copied from https://github.com/mnadel/Metrics.NET.InfluxDB/
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merge master to .net 40 branch with newest code, and copied code from https://github.com/mnadel/Metrics.NET.InfluxDB
to support new influxdb apis