You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ji...@apache.org on 2024/12/27 03:22:56 UTC

(ambari) branch trunk updated (c7477b244e -> 77be49bda8)

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

jialiang pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


    from c7477b244e AMBARI-26238: Add Ambari Java Home configuration for JDK 17 in Ambari… (#3891)
     new 29ba9b6931 AMBARI-26268: Remove default value for ambari-java-home in ambari-server.py to fix setup handling #3915
     new 77be49bda8 AMBARI-26269: Fix regex pattern flag position in ambari_jinja2 filters #3917

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:
 ambari-common/src/main/python/ambari_jinja2/ambari_jinja2/filters.py | 2 +-
 ambari-server/src/main/python/ambari-server.py                       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org


(ambari) 02/02: AMBARI-26269: Fix regex pattern flag position in ambari_jinja2 filters #3917

Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jialiang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 77be49bda8ea10fa21a80c4e806431ceed7e67b8
Author: tongxiaojun <to...@redoop.com>
AuthorDate: Tue Dec 24 13:31:19 2024 +0800

    AMBARI-26269: Fix regex pattern flag position in ambari_jinja2 filters #3917
    
    * AMBARI-26269: Fix regex pattern flag position in ambari_jinja2 filters
    ---------
    
    Co-authored-by: tongxiaojun <to...@gmail.com>
---
 ambari-common/src/main/python/ambari_jinja2/ambari_jinja2/filters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ambari-common/src/main/python/ambari_jinja2/ambari_jinja2/filters.py b/ambari-common/src/main/python/ambari_jinja2/ambari_jinja2/filters.py
index 4b93d5210b..01ba948176 100644
--- a/ambari-common/src/main/python/ambari_jinja2/ambari_jinja2/filters.py
+++ b/ambari-common/src/main/python/ambari_jinja2/ambari_jinja2/filters.py
@@ -20,7 +20,7 @@ from ambari_jinja2.runtime import Undefined
 from ambari_jinja2.exceptions import FilterArgumentError, SecurityError
 
 
-_word_re = re.compile(r"\w+(?u)")
+_word_re = re.compile(r"(?u)\w+")
 
 
 def contextfilter(f):


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org


(ambari) 01/02: AMBARI-26268: Remove default value for ambari-java-home in ambari-server.py to fix setup handling #3915

Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jialiang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 29ba9b6931f9cacd585fd4d425de1fb7c470b455
Author: tongxiaojun <to...@redoop.com>
AuthorDate: Mon Dec 23 13:37:10 2024 +0800

    AMBARI-26268: Remove default value for ambari-java-home in ambari-server.py to fix setup handling #3915
    
    Co-authored-by: tongxiaojun <to...@gmail.com>
---
 ambari-server/src/main/python/ambari-server.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py
index 28a2ea5433..03f6dbb60b 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -764,7 +764,6 @@ def init_setup_parser_options(parser):
   other_group.add_option(
     "--ambari-java-home",
     dest="ambari_java_home",
-    default=None,
     help="Use specified java_home for ambari.  Must be valid on Ambari server hosts",
   )
   other_group.add_option(


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org