Automatic merge of gitlab-org/omnibus-gitlab master

Author: GitLab Bot

config/software/prometheus.rb

@@ -20,7 +20,7 @@
 require "#{Omnibus::Config.project_root}/lib/gitlab/prometheus_helper"
 
 name 'prometheus'
-version = Gitlab::Version.new('prometheus', '2.48.1')
+version = Gitlab::Version.new('prometheus', '2.49.1')
 default_version version.print
 
 license 'APACHE-2.0'

support/dependency_decisions.yml

@@ -29,8 +29,8 @@
   - github.com/hashicorp/consul/api
   - MPL2
   - :who: Dustin Collins
-    :why: https://github.com/hashicorp/consul/blob/api/v1.22.0/LICENSE
-    :versions: [ v1.25.1 ]
+    :why: https://github.com/hashicorp/consul/blob/v1.26.1/api/LICENSE
+    :versions: [ v1.26.1 ]
     :when: 2018-06-22 14:21:19.937703316 Z
 - - :license
   - gitlab.com/lupine/icu