Fix for server/main and update contributors

MariaDB · Oct 8, 2024 · af7fb3e · af7fb3e
1 parent 83c3726
commit af7fb3e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/commits/config/aliases b/commits/config/aliases
@@ -75,6 +75,7 @@ [email protected]                       [email protected]
 [email protected]                               [email protected]
 [email protected]                                 [email protected]
 [email protected]                                  [email protected]
+[email protected]                 [email protected]
 [email protected]                [email protected]
 [email protected]                                    [email protected]
 [email protected]                            [email protected]

diff --git a/commits/config/categories b/commits/config/categories
@@ -39,6 +39,7 @@ CHECK24                   Provider
 Chainguard                Provider
 CONNECT                   Provider
 ClearCode                 Provider
+ClickHouse                Provider
 Codership                 Provider
 Comcast                   Provider
 Dataworkz                 Provider
@@ -58,6 +59,7 @@ Huawei                    Provider
 IBM                       Sponsor
 Independent               Other
 InfoSiftr                 Provider
+IONOS                     Sponsor
 JFrog                     Provider
 Kitware                   Provider
 Kontron                   Provider
@@ -75,6 +77,7 @@ Otto                      Provider
 OVHcloud                  Provider
 Percona                   Sponsor
 PingCAP                   Provider
+Rakuten                   Provider
 Rechnerherz               Provider
 ScaleFlux                 Provider
 Seravo                    Provider

diff --git a/commits/config/domain-map b/commits/config/domain-map
@@ -23,6 +23,7 @@ genusplc.com        Genus
 huawei.com          Huawei
 ibm.com             IBM
 infosiftr.com       InfoSiftr
+ionos.com           IONOS
 jacob.de            Jacob Elektronik
 jd.com              JD.com (Jingdong)
 kali.org            Kali Linux
@@ -47,6 +48,7 @@ oracle.com          Oracle Corporation
 otto.de             Otto
 ovhcloud.com        OVHcloud
 percona.com         Percona
+rakuten-sec.co.jp   Rakuten
 redhat.com          Red Hat
 scaleflux.com       ScaleFlux
 service-now.com     ServiceNow

diff --git a/commits/config/employers b/commits/config/employers
@@ -32,6 +32,7 @@ [email protected]                             Finanz Informatik
 [email protected]                            Independent
 [email protected]                                   Independent
 [email protected]                             Independent
+[email protected]                                 ClickHouse
 [email protected]                              GSoC
 [email protected]                                 Docker
 [email protected]                   Independent
@@ -77,6 +78,7 @@ [email protected]                                 Independent
 [email protected]                          Orange
 [email protected]                                 Independent
 [email protected]                                  Independent
+[email protected]                               Independent
 [email protected]                   University College London
 [email protected]                         SGS Serious Gaming & Simulations GmbH
 [email protected]                                  Independent
@@ -178,9 +180,11 @@ [email protected]                                 Amazon
 [email protected]                                       Independent
 [email protected]                                  Independent
 [email protected]                                     Independent
+[email protected]                              GSoC
 [email protected]                            Independent
 [email protected]                               Independent
-[email protected]                     HardenedBSD
+[email protected]                  Independent
+[email protected]                                  HardenedBSD
 [email protected]                         Independent
 [email protected]                            Independent
 [email protected]                               University of Sydney
@@ -214,7 +218,9 @@ [email protected]                 Tildeslash
 [email protected]                            Independent
 [email protected]                                   Independent
 [email protected]                                    Amazon
+[email protected]                    Independent
 [email protected]                              MariaDB Foundation
+[email protected]                                   Independent
 [email protected]                                   Independent
 [email protected]                                JFrog
 [email protected]                       Independent

diff --git a/commits/parse_git_log.sh b/commits/parse_git_log.sh
@@ -26,7 +26,7 @@ if [ $4 -eq 0 ]; then
 fi
 echo "Extracting git log"
 if [ $TREE = "server" ]; then
-    BRANCHES="--remotes=\"*/10.[0-9]\" --remotes=\"*/10.1[0-9]\" --remotes=\"*/11.[0-9]\""
+    BRANCHES="--remotes=\"*/10.[0-9]\" --remotes=\"*/10.1[0-9]\" --remotes=\"*/11.[0-9]\" --remotes=\"*/main\""
 elif [ $TREE = "mariadb-columnstore-engine" ]; then
     BRANCHES="--remotes=\"*/develo?\" --remotes=\"*/develop-1.[0-9]\" --remotes=\"*/develop-[5-9]\"  --remotes=\"*/develop-2[0-9].[0-9][0-9]\""
 elif [ $TREE = "mariadb-connector-c" ]; then