Skip to content

Commit

Permalink
Revert "Changes default return value for cluster.batch_connect_ssh_al… (
Browse files Browse the repository at this point in the history
#820)

* Revert "Changes default return value for cluster.batch_connect_ssh_allow? (#818)"

This reverts commit 6504b5f.

* Updates changelog & version for next release
  • Loading branch information
HazelGrant authored Nov 29, 2023
1 parent 9926c2b commit 122835c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [0.24.1] - 11-29-2023

[820](https://github.com/OSC/ood_core/pull/820) Reverts [818](https://github.com/OSC/ood_core/pull/818)

## [0.24.0] - 11-28-2023

- Code cleanup and separate arguments with whitespace in Fujitsu TCS adapter by @mnakao in https://github.com/OSC/ood_core/pull/808
Expand Down
4 changes: 2 additions & 2 deletions lib/ood_core/cluster.rb
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ def allow?
# @return [Boolean, nil] whether cluster supports SSH to batch connect node
def batch_connect_ssh_allow?
return @batch_connect_ssh_allow if defined?(@batch_connect_ssh_allow)
return @batch_connect_ssh_allow = true if batch_connect_config.nil?
return @batch_connect_ssh_allow = nil if batch_connect_config.nil?

@batch_connect_ssh_allow = batch_connect_config.fetch(:ssh_allow, true)
@batch_connect_ssh_allow = batch_connect_config.fetch(:ssh_allow, nil)
end

# The comparison operator
Expand Down
2 changes: 1 addition & 1 deletion lib/ood_core/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module OodCore
# The current version of {OodCore}
VERSION = "0.24.0"
VERSION = "0.24.1"
end
2 changes: 1 addition & 1 deletion spec/cluster_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
end

it 'has default for batch_connect_ssh_allow?' do
expect(owens.batch_connect_ssh_allow?).to be true
expect(owens.batch_connect_ssh_allow?).to be_nil
end

it 'can enable batch_connect_ssh_allow?' do
Expand Down

0 comments on commit 122835c

Please sign in to comment.