You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2022/07/08 10:56:06 UTC
[rocketmq] branch develop-merge-5.0.0 updated (2cb8473f2 -> 2a9113686)
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a change to branch develop-merge-5.0.0
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
omit 2cb8473f2 Make travis ci can pass when function interface changed
new d4f5d9696 Make travis ci can pass when function interface changed
new 2a9113686 Make broker can start normally even if the configuration file is not set
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2cb8473f2)
\
N -- N -- N refs/heads/develop-merge-5.0.0 (2a9113686)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 5 ++---
broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
[rocketmq] 01/02: Make travis ci can pass when function interface changed
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop-merge-5.0.0
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit d4f5d96967dd93011b4aeecd34e795780e04d495
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Fri Jul 8 15:55:19 2022 +0800
Make travis ci can pass when function interface changed
---
.travis.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8a2d8c749..837ae1fe7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,9 +50,8 @@ before_script:
script:
- mvn verify -DskipTests
- travis_retry mvn -B clean apache-rat:check
- - travis_retry mvn -B clean test jacoco:report coveralls:report
- - travis_retry mvn -B clean test -pl test -Pit-test
- - travis_retry mvn -B clean install -DskipTests
+ - travis_retry mvn -B install jacoco:report coveralls:report
+ - travis_retry mvn -B clean install -pl test -Pit-test
after_success:
- mvn sonar:sonar -Psonar-apache
[rocketmq] 02/02: Make broker can start normally even if the configuration file is not set
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop-merge-5.0.0
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 2a9113686c5c2c81ad848942a2b630b80053eaa1
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Fri Jul 8 18:55:39 2022 +0800
Make broker can start normally even if the configuration file is not set
---
broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
index ca388b6cf..b9d19e283 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
@@ -120,10 +120,10 @@ public class BrokerStartup {
configFileHelper.setFile(file);
configFile = file;
BrokerPathConfigHelper.setBrokerConfigPath(file);
+ properties = configFileHelper.loadConfig();
}
}
- properties = configFileHelper.loadConfig();
if (properties != null) {
properties2SystemEnv(properties);
MixAll.properties2Object(properties, brokerConfig);