Merge branch...
Merge branch '7233-gitlab-ctl-geo-replication-pause-fails-when-postgresql-dir-configured' into 'master' Use postgresql['dir'] directory when it exists Closes #7233 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/8203 Merged-by:Ian Baum <ibaum@gitlab.com> Approved-by:
Douglas Barbosa Alexandre <dbalexandre@gmail.com> Approved-by:
Ian Baum <ibaum@gitlab.com> Reviewed-by:
Douglas Barbosa Alexandre <dbalexandre@gmail.com> Reviewed-by:
João Alexandre Cunha <j.a.cunha@gmail.com> Co-authored-by:
c_fons <cfons@gitlab.com>
Showing
- files/gitlab-ctl-commands-ee/lib/geo/pitr_file.rb 24 additions, 9 deletionsfiles/gitlab-ctl-commands-ee/lib/geo/pitr_file.rb
- files/gitlab-ctl-commands-ee/lib/geo/promote_db.rb 2 additions, 4 deletionsfiles/gitlab-ctl-commands-ee/lib/geo/promote_db.rb
- files/gitlab-ctl-commands-ee/lib/geo/replication_toggle_command.rb 23 additions, 8 deletions...lab-ctl-commands-ee/lib/geo/replication_toggle_command.rb
- spec/chef/gitlab-ctl-commands-ee/lib/geo/pitr_file_spec.rb 21 additions, 4 deletionsspec/chef/gitlab-ctl-commands-ee/lib/geo/pitr_file_spec.rb
- spec/chef/gitlab-ctl-commands-ee/lib/geo/promote_db_spec.rb 1 addition, 1 deletionspec/chef/gitlab-ctl-commands-ee/lib/geo/promote_db_spec.rb
- spec/chef/gitlab-ctl-commands-ee/lib/geo/replication_toggle_command_spec.rb 36 additions, 1 deletion...tl-commands-ee/lib/geo/replication_toggle_command_spec.rb
Loading
Please register or sign in to comment