This is an automated email from the ASF dual-hosted git repository. vatamane pushed a commit to branch merge-3.3.x-to-main in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit a533a27723419104e0f601611a39ca8888943579 Merge: f5935c65d 97014f1d0 Author: Nick Vatamaniuc <[email protected]> AuthorDate: Wed May 10 13:25:03 2023 -0400 Merge branch '3.3.x' into merge-3.3.x-to-main .asf.yaml | 6 ++++++ dev/run | 1 - rel/reltool.config | 2 +- src/docs/src/whatsnew/3.3.rst | 1 + version.mk | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --cc dev/run index fc1022ccc,df1a0b105..8ac76b7b2 --- a/dev/run +++ b/dev/run @@@ -462,32 -451,6 +462,31 @@@ def boot_haproxy(ctx) ) +def boot_nouveau(ctx): + if not ctx["with_nouveau"]: + return + + version = "1.0-SNAPSHOT" + cmd = [ + "java", + "-server", + "-jar", + "build/libs/server-%s-dist.jar" % version, + "server", + "nouveau.yaml", + ] - + logfname = os.path.join(ctx["devdir"], "logs", "nouveau.log") + log = open(logfname, "w") + return sp.Popen( + " ".join(cmd), + cwd="nouveau", + shell=True, + stdin=sp.PIPE, + stdout=log, + stderr=sp.STDOUT, + ) + + def hack_default_ini(ctx, node, contents): contents = re.sub( "^\[httpd\]$",
