Merge branch 'master' into multi-resource-metrics-config

tomkerkhove · Aug 23, 2019 · 255bb74 · 255bb74
2 parents 79c0d51 + f86d53c
commit 255bb74
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -74,7 +74,7 @@ GEM
       listen (= 3.1.5)
       mercenary (~> 0.3)
       minima (= 2.5.0)
-      nokogiri (>= 1.10.4, < 2.0)
+      nokogiri (>= 1.8.5, < 2.0)
       rouge (= 2.2.1)
       terminal-table (~> 1.4)
     github-pages-health-check (1.16.1)
@@ -85,7 +85,7 @@ GEM
       typhoeus (~> 1.3)
     html-pipeline (2.12.0)
       activesupport (>= 2)
-      nokogiri (>= 1.10.4)
+      nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -251,4 +251,4 @@ DEPENDENCIES
   nokogiri (>= 1.10.4)
 
 BUNDLED WITH
-   1.17.3
+   2.0.2
diff --git a/src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj b/src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="Guard.Net" Version="1.2.0" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.24.1" />
+    <PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.25.0" />
     <PackageReference Include="Prometheus.Client" Version="3.0.1" />
     <PackageReference Include="YamlDotNet" Version="6.1.2" />
   </ItemGroup>

diff --git a/src/Promitor.Integrations.AzureMonitor/Promitor.Integrations.AzureMonitor.csproj b/src/Promitor.Integrations.AzureMonitor/Promitor.Integrations.AzureMonitor.csproj
@@ -16,8 +16,8 @@
   <ItemGroup>
     <PackageReference Include="Guard.NET" Version="1.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.6" />
-    <PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.24.1" />
-    <PackageReference Include="Microsoft.Azure.Management.Monitor.Fluent" Version="1.24.1" />
+    <PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.25.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Monitor.Fluent" Version="1.25.0" />
     <PackageReference Include="Microsoft.Data.OData" Version="5.8.4" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>