Skip to content

Commit

Permalink
Changes for new branch spassky
Browse files Browse the repository at this point in the history
  • Loading branch information
Fryguy committed Feb 26, 2025
1 parent f2a1c4d commit bd69d1b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG IMAGE_REF=latest
ARG IMAGE_REF=latest-spassky
FROM docker.io/manageiq/manageiq-ui-worker:${IMAGE_REF}
MAINTAINER ManageIQ https://github.com/ManageIQ/manageiq

Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundle
#
# VMDB specific gems
#
gem "manageiq-gems-pending", ">0", :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :branch => "master"
gem "manageiq-gems-pending", ">0", :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :branch => "spassky"

# when using this Gemfile inside a providers Gemfile, the dependency for the provider is already declared
def manageiq_plugin(plugin_name)
unless dependencies.detect { |d| d.name == plugin_name }
gem plugin_name, :git => "https://github.com/ManageIQ/#{plugin_name}", :branch => "master"
gem plugin_name, :git => "https://github.com/ManageIQ/#{plugin_name}", :branch => "spassky"
end
end

Expand Down Expand Up @@ -110,7 +110,7 @@ gem "american_date"
### providers
group :amazon, :manageiq_default do
manageiq_plugin "manageiq-providers-amazon"
gem "amazon_ssa_support", :require => false, :git => "https://github.com/ManageIQ/amazon_ssa_support.git", :branch => "master" # Temporary dependency to be moved to manageiq-providers-amazon when officially release
gem "amazon_ssa_support", :require => false, :git => "https://github.com/ManageIQ/amazon_ssa_support.git", :branch => "spassky" # Temporary dependency to be moved to manageiq-providers-amazon when officially release
end

group :ansible_tower, :manageiq_default do
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
master
spassky-pre
2 changes: 1 addition & 1 deletion lib/vmdb/deprecation.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Vmdb
class Deprecation
def self.instance
@instance ||= ActiveSupport::Deprecation.new("T-release", "ManageIQ").tap { |d| d.behavior = default_behavior }
@instance ||= ActiveSupport::Deprecation.new("Tal", "ManageIQ").tap { |d| d.behavior = default_behavior }
end

def self.method_missing(method_name, ...)
Expand Down

0 comments on commit bd69d1b

Please sign in to comment.