Skip to content

Standardize CLI formatting with mix format (backport #5958) (backport #5971) (backport #5983)#6009

Merged
michaelklishin merged 9 commits intov3.9.xfrom
mergify/bp/v3.9.x/pr-5983
Oct 4, 2022
Merged

Standardize CLI formatting with mix format (backport #5958) (backport #5971) (backport #5983)#6009
michaelklishin merged 9 commits intov3.9.xfrom
mergify/bp/v3.9.x/pr-5983

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 4, 2022

This is an automatic backport of pull request #5983 done by Mergify.
Cherry-pick of 66e6517 has failed:

On branch mergify/bp/v3.9.x/pr-5983
Your branch is ahead of 'origin/v3.9.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 66e65175d8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deps/rabbitmq_cli/config/config.exs
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/auto_complete.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/command_behaviour.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/alarms.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/command_modules.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/feature_flags.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/input.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/listeners.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/log_files.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/memory.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/networking.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/platform.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/validators.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/version.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_user_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/authenticate_user_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/autocomplete_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/await_online_nodes_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/change_password_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_permissions_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_topic_permissions_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_user_limits_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/close_all_connections_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/close_connection_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/cluster_status_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_user_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/enable_feature_flag_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/environment_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/eval_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/eval_file_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/export_definitions_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/force_boot_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/force_gc_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/force_reset_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/forget_cluster_node_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/hipe_compile_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/join_cluster_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_consumers_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_feature_flags_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_queues_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_unresponsive_queues_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_user_limits_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/node_health_check_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/ping_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/report_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/reset_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/resume_listeners_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/rotate_logs_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_global_parameter_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_log_level_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_operator_policy_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_parameter_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_permissions_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_policy_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_topic_permissions_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_user_tags_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vhost_tags_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vm_memory_high_watermark_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/shutdown_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/start_app_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/status_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/stop_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/suspend_listeners_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/sync_queue_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/update_cluster_nodes_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/version_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/wait_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/default_output.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/alarms_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/certificates_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/check_alarms_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/check_certificate_expiration_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/check_local_alarms_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/check_port_connectivity_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/check_port_listener_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/check_protocol_listener_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/check_running_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/cipher_suites_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/command_line_arguments_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/consume_event_stream_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/disable_auth_attempt_source_tracking_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/enable_auth_attempt_source_tracking_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/erlang_cookie_hash_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/erlang_cookie_sources_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/erlang_version_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/is_booting_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/is_running_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/list_network_interfaces_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/list_node_auth_attempt_stats_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/log_location_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/log_tail_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/log_tail_stream_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/maybe_stuck_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/memory_breakdown_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/observer_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/os_env_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/remote_shell_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/resolve_hostname_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/resolver_info_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/runtime_thread_stats_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/server_version_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/tls_versions_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/diagnostics_helpers.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/formatter_behaviour.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/formatter_helpers.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json_stream.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/plugins.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/pretty_table.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/disable_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/enable_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/is_enabled.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/list_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/set_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/error_output.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/printer_behaviour.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/add_member_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/check_if_node_is_mirror_sync_critical_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/check_if_node_is_quorum_critical_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/grow_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/peek_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/rebalance_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/reclaim_quorum_memory_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/shrink_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/streams/commands/delete_replica_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/streams/commands/set_stream_retention_policy_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/streams/commands/stream_status_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/time_unit.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/upgrade/commands/await_online_quorum_plus_one_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/upgrade/commands/await_online_synchronized_mirror_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/upgrade/commands/drain_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/upgrade/commands/post_upgrade_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/upgrade/commands/revive_command.ex
	modified:   deps/rabbitmq_cli/lib/rabbitmqctl.ex
	modified:   deps/rabbitmq_cli/test/core/args_processing_test.exs
	modified:   deps/rabbitmq_cli/test/core/auto_complete_test.exs
	modified:   deps/rabbitmq_cli/test/core/command_modules_test.exs
	modified:   deps/rabbitmq_cli/test/core/default_output_test.exs
	modified:   deps/rabbitmq_cli/test/core/distribution_test.exs
	modified:   deps/rabbitmq_cli/test/core/helpers_test.exs
	modified:   deps/rabbitmq_cli/test/core/information_unit_test.exs
	modified:   deps/rabbitmq_cli/test/core/json_stream_test.exs
	modified:   deps/rabbitmq_cli/test/core/listeners_test.exs
	modified:   deps/rabbitmq_cli/test/core/os_pid_test.exs
	modified:   deps/rabbitmq_cli/test/core/parser_test.exs
	modified:   deps/rabbitmq_cli/test/core/rpc_stream_test.exs
	modified:   deps/rabbitmq_cli/test/core/table_formatter_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/add_user_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/authenticate_user_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/autocomplete_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/await_online_nodes_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/await_startup_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/cancel_sync_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/change_cluster_node_type_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/change_password_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/clear_global_parameter_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/clear_operator_policy_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/clear_parameter_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/clear_password_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/clear_permissions_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/clear_policy_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/clear_topic_permissions_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/clear_user_limits_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/clear_vhost_limits_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/close_all_connections_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/close_all_user_connections_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/close_connection_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/cluster_status_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/delete_queue_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/delete_user_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/delete_vhost_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/enable_feature_flag_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/encode_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/environment_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/eval_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/eval_file_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/exec_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/export_definitions_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/force_gc_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/force_reset_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/help_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/join_cluster_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_bindings_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_channels_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_ciphers_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_connections_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_consumers_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_exchanges_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_feature_flags_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_global_parameters_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_hashes_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_operator_policies_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_parameters_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_permissions_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_policies_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_queues_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_topic_permissions_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_user_limits_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_user_permissions_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_user_topic_permissions_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_users_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_vhost_limits_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_vhosts_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/node_health_check_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/ping_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/purge_queue_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/report_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/reset_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/restart_vhost_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/resume_listeners_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_cluster_name_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_disk_free_limit_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_global_parameter_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_log_level_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_operator_policy_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_parameter_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_permissions_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_policy_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_topic_permissions_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_user_limits_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_user_tags_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_vhost_limits_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_vhost_tags_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/set_vm_memory_high_watermark_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/shutdown_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/start_app_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/status_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/stop_app_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/stop_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/suspend_listeners_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/sync_queue_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/trace_off_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/trace_on_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/update_cluster_nodes_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/version_command_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/wait_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/alarms_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/check_alarms_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/check_local_alarms_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/check_port_connectivity_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/check_port_listener_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/check_protocol_listener_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/check_running_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/check_virtual_hosts_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/cipher_suites_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/command_line_arguments_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/consume_event_stream_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/disable_auth_attempt_source_tracking_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/discover_peers_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/enable_auth_attempt_source_tracking_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/erlang_cookie_hash_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/erlang_version_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/is_booting_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/is_running_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/list_network_interfaces_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/list_node_auth_attempt_stats_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/listeners_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/log_location_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/log_tail_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/log_tail_stream_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/maybe_stuck_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/memory_breakdown_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/observer_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/os_env_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/remote_shell_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/resolve_hostname_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/resolver_info_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/runtime_thread_stats_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/schema_info_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/server_version_command_test.exs
	modified:   deps/rabbitmq_cli/test/diagnostics/tls_versions_command_test.exs
	modified:   deps/rabbitmq_cli/test/json_formatting.exs
	modified:   deps/rabbitmq_cli/test/plugins/directories_command_test.exs
	modified:   deps/rabbitmq_cli/test/plugins/disable_plugins_command_test.exs
	modified:   deps/rabbitmq_cli/test/plugins/is_enabled_command_test.exs
	modified:   deps/rabbitmq_cli/test/plugins/list_plugins_command_test.exs
	modified:   deps/rabbitmq_cli/test/plugins/plugins_formatter_test.exs
	modified:   deps/rabbitmq_cli/test/queues/add_member_command_test.exs
	modified:   deps/rabbitmq_cli/test/queues/check_if_node_is_mirror_sync_critical_command_test.exs
	modified:   deps/rabbitmq_cli/test/queues/check_if_node_is_quorum_critical_command_test.exs
	modified:   deps/rabbitmq_cli/test/queues/delete_member_command_test.exs
	modified:   deps/rabbitmq_cli/test/queues/grow_command_test.exs
	modified:   deps/rabbitmq_cli/test/queues/peek_command_test.exs
	modified:   deps/rabbitmq_cli/test/queues/quorum_status_command_test.exs
	modified:   deps/rabbitmq_cli/test/queues/reclaim_quorum_memory_command_test.exs
	modified:   deps/rabbitmq_cli/test/queues/shrink_command_test.exs
	modified:   deps/rabbitmq_cli/test/queues/stream_status_command_test.exs
	modified:   deps/rabbitmq_cli/test/rabbitmqctl_test.exs
	modified:   deps/rabbitmq_cli/test/streams/add_replica_command_test.exs
	modified:   deps/rabbitmq_cli/test/streams/delete_replica_command_test.exs
	modified:   deps/rabbitmq_cli/test/streams/set_stream_retention_policy_command_test.exs
	modified:   deps/rabbitmq_cli/test/test_helper.exs
	modified:   deps/rabbitmq_cli/test/upgrade/await_online_quorum_plus_one_command_test.exs
	modified:   deps/rabbitmq_cli/test/upgrade/await_online_synchronized_mirror_command_test.exs
	modified:   deps/rabbitmq_cli/test/upgrade/drain_command_test.exs
	modified:   deps/rabbitmq_cli/test/upgrade/post_upgrade_command_test.exs
	modified:   deps/rabbitmq_cli/test/upgrade/revive_command_test.exs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex
	both modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/decode_command.ex
	both modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/encode_command.ex
	both modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/import_definitions_command.ex
	both modified:   deps/rabbitmq_cli/mix.exs
	both modified:   deps/rabbitmq_cli/test/ctl/add_vhost_command_test.exs
	both modified:   deps/rabbitmq_cli/test/ctl/decode_command_test.exs
	both modified:   deps/rabbitmq_cli/test/ctl/import_definitions_command_test.exs
	both modified:   deps/rabbitmq_cli/test/plugins/enable_plugins_command_test.exs
	both modified:   deps/rabbitmq_cli/test/plugins/set_plugins_command_test.exs

Cherry-pick of 3dbf7dd has failed:

On branch mergify/bp/v3.9.x/pr-5983
Your branch is ahead of 'origin/v3.9.x' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3dbf7dd1e5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/core/feature_flags.ex
	modified:   deps/rabbitmq_cli/test/ctl/enable_feature_flag_test.exs
	modified:   deps/rabbitmq_cli/test/ctl/list_feature_flags_command_test.exs
	modified:   deps/rabbitmq_cli/test/upgrade/drain_command_test.exs
	modified:   deps/rabbitmq_cli/test/upgrade/revive_command_test.exs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex
	both modified:   deps/rabbitmq_cli/mix.exs

Cherry-pick of 3e7d067 has failed:

On branch mergify/bp/v3.9.x/pr-5983
Your branch is ahead of 'origin/v3.9.x' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3e7d067207.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/test-mixed-versions.yaml
	both modified:   .github/workflows/test.yaml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Ayanda-D and others added 8 commits October 4, 2022 11:00
(cherry picked from commit 56ca86a)
(cherry picked from commit 4bdbf7e)
(cherry picked from commit 5571e8b)
(cherry picked from commit 4cbbaad)
(cherry picked from commit 059978e)

# Conflicts:
#	deps/rabbitmq_cli/lib/rabbitmq/cli/core/feature_flags.ex
#	deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex
#	deps/rabbitmq_cli/mix.exs
#	deps/rabbitmq_cli/test/ctl/enable_feature_flag_test.exs
#	deps/rabbitmq_cli/test/ctl/list_feature_flags_command_test.exs
#	deps/rabbitmq_cli/test/upgrade/drain_command_test.exs
#	deps/rabbitmq_cli/test/upgrade/revive_command_test.exs
(cherry picked from commit 66e6517)

# Conflicts:
#	deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex
#	deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/decode_command.ex
#	deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/encode_command.ex
#	deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/import_definitions_command.ex
#	deps/rabbitmq_cli/mix.exs
#	deps/rabbitmq_cli/test/ctl/add_vhost_command_test.exs
#	deps/rabbitmq_cli/test/ctl/decode_command_test.exs
#	deps/rabbitmq_cli/test/ctl/import_definitions_command_test.exs
#	deps/rabbitmq_cli/test/plugins/enable_plugins_command_test.exs
#	deps/rabbitmq_cli/test/plugins/set_plugins_command_test.exs
(cherry picked from commit 345a580)
(cherry picked from commit 5cc730e)
(cherry picked from commit 46e3e29)
(cherry picked from commit c4b42f6)
(cherry picked from commit 27dae04)
(cherry picked from commit 32ba9be)
(cherry picked from commit febb4f6)
(cherry picked from commit d8f9b46)
(cherry picked from commit c49ef55)
(cherry picked from commit 8218198)
(cherry picked from commit 01994ed)
(cherry picked from commit 681d6c3)
(cherry picked from commit 3dbf7dd)

# Conflicts:
#	deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex
#	deps/rabbitmq_cli/mix.exs
(cherry picked from commit 3e7d067)

# Conflicts:
#	.github/workflows/test-mixed-versions.yaml
#	.github/workflows/test.yaml
@mergify mergify bot added the conflicts label Oct 4, 2022
@michaelklishin michaelklishin added this to the 3.9.24 milestone Oct 4, 2022
@michaelklishin michaelklishin merged commit 09aff0a into v3.9.x Oct 4, 2022
@michaelklishin michaelklishin deleted the mergify/bp/v3.9.x/pr-5983 branch October 4, 2022 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants