This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq.git
commit f47ae99fb98148737ec3a9c3712ec6a66b8c2426 Merge: 3652e480b 7cbe23974 Author: JB Onofré <[email protected]> AuthorDate: Mon Apr 1 11:28:34 2024 +0200 Merge pull request #1195 from apache/revert-1193-AMQ-9460 Revert "AMQ-9460: Don't override ACTIVEMQ_OPTS when provided by user" assembly/src/docker/Dockerfile | 2 +- assembly/src/release/bin/activemq | 7 +++++++ assembly/src/release/bin/setenv | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-)
