[incubator-inlong] branch release-0.11.0 updated (9f096ca -> 5f0b526)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aloyszhang pushed a change to branch release-0.11.0
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git.


 discard 9f096ca  [INLONG-1688] add changes log for 0.11.0-release (#1710)
     new 5f0b526  [INLONG-1716][manager] fix the mysql config for docker images (#1717)

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   (9f096ca)
            \
             N -- N -- N   refs/heads/release-0.11.0 (5f0b526)

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 1 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:
 CHANGES.md                                      | 98 -------------------------
 inlong-manager/manager-docker/manager-docker.sh |  4 +-
 2 files changed, 2 insertions(+), 100 deletions(-)

[incubator-inlong] 01/01: [INLONG-1716][manager] fix the mysql config for docker images (#1717)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aloyszhang pushed a commit to branch release-0.11.0
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git

commit 5f0b526414b0f0edb69cb7f69a40f96949382b3f
Author: dockerzhang <do...@apache.org>
AuthorDate: Tue Oct 26 10:03:50 2021 +0800

    [INLONG-1716][manager] fix the mysql config for docker images (#1717)
    
    Co-authored-by: dockerzhang <do...@tencent.com>
---
 inlong-manager/manager-docker/manager-docker.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inlong-manager/manager-docker/manager-docker.sh b/inlong-manager/manager-docker/manager-docker.sh
index 24d4b18..2c1f0be 100644
--- a/inlong-manager/manager-docker/manager-docker.sh
+++ b/inlong-manager/manager-docker/manager-docker.sh
@@ -30,8 +30,8 @@ conf_file="${file_path}"/conf/application-"${ACTIVE_PROFILE}".properties
 # replace the configuration
 sed -i "s/spring.profiles.active=.*$/spring.profiles.active=${ACTIVE_PROFILE}/g" "${file_path}"/conf/application.properties
 sed -i "s/127.0.0.1:3306/${JDBC_URL}/g" "${conf_file}"
-sed -i "s/datasource.username=.*$/datasource.username=${USERNAME}/g" "${conf_file}"
-sed -i "s/datasource.password=.*$/datasource.password=${PASSWORD}/g" "${conf_file}"
+sed -i "s/datasource.druid.username=.*$/datasource.druid.username=${USERNAME}/g" "${conf_file}"
+sed -i "s/datasource.druid.password=.*$/datasource.druid.password=${PASSWORD}/g" "${conf_file}"
 
 sed -i "s/cluster.tube.manager=.*$/cluster.tube.manager\=${TUBE_MANAGER}/g" "${conf_file}"
 sed -i "s/cluster.tube.master=.*$/cluster.tube.master\=${TUBE_MASTER}/g" "${conf_file}"