Commits included in testrun 77345:c79d6b49e80c

changeset 77298:9216cc8c26cb
date:2020-10-09 08:53 +0200
user:Sjoerd Mullender <sjoerd@acm.org>
branch:default
files:tools/mserver/mserver5.c
message:Merge with octbugs branch.
 
changeset 77301:d4d70bae8eed
date:2020-10-09 10:29 +0200
user:Aris Koning <aris.koning@monetdbsolutions.com>
branch:default
files:
message:Merge with monetdbe-proxy.
 
changeset 77304:a50c241611d5
date:2020-10-09 09:48 +0200
user:Sjoerd Mullender <sjoerd@acm.org>
branch:default
files:.bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc
message:Merge with octbugs branch, not changing any files.
 
changeset 77309:4ea7f15c36f0
date:2020-10-09 09:49 +0200
user:Sjoerd Mullender <sjoerd@acm.org>
branch:default
files:MonetDB.spec cmake/monetdb-versions.cmake
message:Merge with octbugs branch.
 
changeset 77312:7597347580c5
date:2020-10-09 09:50 +0200
user:Sjoerd Mullender <sjoerd@acm.org>
branch:default
files:.bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc
message:Merge with octbugs branch, not changing any files..
 
changeset 77313:3433912871c0
date:2020-10-09 10:34 +0200
user:Sjoerd Mullender <sjoerd@acm.org>
branch:default
files:
message:Merge heads.
 
changeset 77315:59de99d3ebc9
date:2020-10-09 10:50 +0200
user:Pedro Ferreira <pedro.ferreira@monetdbsolutions.com>
branch:default
files:
message:Merged with octbugs
 
changeset 77345:c79d6b49e80c
date:2020-10-09 17:25 +0200
user:Pedro Ferreira <pedro.ferreira@monetdbsolutions.com>
branch:default
files:monetdb5/modules/kernel/batstr.c tools/monetdbe/monetdbe.c tools/monetdbe/monetdbe_mapi.c
message:Merged with octbugs