Merge branch 'v3.13.x' into su_aws/update_dependencies
This commit is contained in:
		
						commit
						f9bd2db720
					
				|  | @ -142,13 +142,10 @@ _APP_ENV = """[ | ||||||
|         {credentials_obfuscation_fallback_secret, <<"nocookie">>}, |         {credentials_obfuscation_fallback_secret, <<"nocookie">>}, | ||||||
|         {dead_letter_worker_consumer_prefetch, 32}, |         {dead_letter_worker_consumer_prefetch, 32}, | ||||||
|         {dead_letter_worker_publisher_confirm_timeout, 180000}, |         {dead_letter_worker_publisher_confirm_timeout, 180000}, | ||||||
| 
 |  | ||||||
|         %% EOL date for the current release series, if known/announced |  | ||||||
| 		{release_series_eol_date, none}, |  | ||||||
| 
 |  | ||||||
| 		{vhost_process_reconciliation_run_interval, 30}, | 		{vhost_process_reconciliation_run_interval, 30}, | ||||||
|         %% for testing |         %% for testing | ||||||
|         {vhost_process_reconciliation_enabled, true} |         {vhost_process_reconciliation_enabled, true}, | ||||||
|  |         {license_line, "Licensed under the MPL 2.0. Website: https://rabbitmq.com"} | ||||||
| 	  ] | 	  ] | ||||||
| """ | """ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -125,11 +125,10 @@ define PROJECT_ENV | ||||||
| 		{credentials_obfuscation_fallback_secret, <<"nocookie">>}, | 		{credentials_obfuscation_fallback_secret, <<"nocookie">>}, | ||||||
|       	{dead_letter_worker_consumer_prefetch, 32}, |       	{dead_letter_worker_consumer_prefetch, 32}, | ||||||
|       	{dead_letter_worker_publisher_confirm_timeout, 180000}, |       	{dead_letter_worker_publisher_confirm_timeout, 180000}, | ||||||
| 		%% EOL date for the current release series, if known/announced |  | ||||||
| 		{release_series_eol_date, none}, |  | ||||||
| 		{vhost_process_reconciliation_run_interval, 30}, | 		{vhost_process_reconciliation_run_interval, 30}, | ||||||
| 		%% for testing | 		%% for testing | ||||||
| 		{vhost_process_reconciliation_enabled, true} | 		{vhost_process_reconciliation_enabled, true}, | ||||||
|  | 		{license_line, "Licensed under the MPL 2.0. Website: https://rabbitmq.com"} | ||||||
| 	  ] | 	  ] | ||||||
| endef | endef | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue