diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 21:35:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 21:35:05 +0100 |
| commit | a5679af1b13bb0c7c4eaa75f27551072dc18fb7d (patch) | |
| tree | 7d039fb5e83c331daa75f9b9b67625b0469f6a9b /sql/contributors.h | |
| parent | 20c4dfd4a9e7c5f2f570488a7ead0b7c74e61817 (diff) | |
| parent | 5f2f3c4fa81851b45dcee33601f14e05f6407333 (diff) | |
| download | mariadb-git-a5679af1b13bb0c7c4eaa75f27551072dc18fb7d.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/contributors.h')
| -rw-r--r-- | sql/contributors.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sql/contributors.h b/sql/contributors.h index 2479f611727..255decd19cc 100644 --- a/sql/contributors.h +++ b/sql/contributors.h @@ -37,18 +37,16 @@ struct show_table_contributors_st { struct show_table_contributors_st show_table_contributors[]= { /* MariaDB foundation members, in contribution, size , time order */ - {"Booking.com", "http://www.booking.com", "Founding member of the MariaDB foundation"}, - {"SkySQL Ab", "http://www.skysql.com", "Founding member of the MariaDB foundation"}, - {"Auttomatic", "http://automattic.com", "Member of the MariaDB foundation"}, - {"Parallels", "http://www.parallels.com/products/plesk", "Founding member of the MariaDB foundation"}, + {"Booking.com", "http://www.booking.com", "Founding member of the MariaDB Foundation"}, + {"MariaDB Corporation", "https://mariadb.com", "Founding member of the MariaDB Foundation"}, + {"Auttomattic", "http://automattic.com", "Member of the MariaDB Foundation"}, + {"Parallels", "http://www.parallels.com/products/plesk", "Founding member of the MariaDB Foundation"}, + {"Acronis", "http://www.acronis.com", "Member of the MariaDB Foundation"}, /* Smaller sponsors, newer per year */ - {"Verkkokauppa.com", "Finland", "Sponsor of the MariaDB foundation"}, - {"Webyog", "Bangalor", "Sponsor of the MariaDB foundation"}, - {"Percona", "USA", "Sponsor of the MariaDB foundation"}, - {"Jelastic.com", "Russia", "Sponsor of the MariaDB foundation"}, - {"Planetta.net", "Finland", "Sponsor of the MariaDB foundation"}, - {"Open query", "Australia", "Sponsor of the MariaDB foundation"}, + {"Verkkokauppa.com", "Finland", "Sponsor of the MariaDB Foundation"}, + {"Webyog", "Bangalore", "Sponsor of the MariaDB Foundation"}, + {"Wikimedia Foundation", "USA", "Sponsor of the MariaDB Foundation"}, /* Sponsors of important features */ {"Google", "USA", "Sponsoring parallel replication and GTID" }, |