summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriangilfillan <github@greenman.co.za>2016-07-27 15:29:32 +0200
committeriangilfillan <github@greenman.co.za>2016-07-27 15:29:32 +0200
commit5d0dfcbecb3026fc105bd0dcc7a9b2a5c9536130 (patch)
treef230f3c1b7173d73c57fe300db5341a2c87dd5f6
parentdf4fddb8961355fc68f32375d2bac5735057f205 (diff)
downloadmariadb-git-5d0dfcbecb3026fc105bd0dcc7a9b2a5c9536130.tar.gz
Update contributors
-rw-r--r--CREDITS34
-rw-r--r--mysql-test/r/contributors.result17
-rw-r--r--sql/contributors.h21
3 files changed, 37 insertions, 35 deletions
diff --git a/CREDITS b/CREDITS
index 1f071e4fb44..f0e6de7f08f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,24 +1,26 @@
MariaDB is brought to you by the MariaDB Foundation, a non profit
organization registered in the USA.
-The current main members and sponsors of the MariaDB Foundation are:
-
-MariaDB Corporation http://www.mariadb.com (2013 - 2016)
-Booking.com http://www.booking.com (2013 - 2016)
-Parallels http://www.parallels.com/products/plesk (2013 - 2016)
-Automattic http://automattic.com (2014 - 2016)
-Verkkokauppa.com http://verkkokauppa.com (2015 - 2016)
-Visma http://visma.com/ (2015 - 2016)
-Webyog http://webyog.com (2015 - 2016)
-Wikimedia Foundation http://wikimedia.org (2015 - 2016)
-Acronis http://acronis.com (2016)
-
-For a full list of supporters and sponsors see
+The current main sponsors of the MariaDB Foundation are:
+
+Booking.com http://www.booking.com (2013 - 2016)
+Development Bank of Singapore http://dbs.com (2016)
+MariaDB Corporation https://www.mariadb.com (2013 - 2016)
+Visma http://visma.com (2015 - 2016)
+Acronis http://acronis.com (2016)
+Nexedi https://www.nexedi.com (2016)
+Automattic https://automattic.com (2014 - 2016)
+Verkkokauppa.com https://www.verkkokauppa.com (2015 - 2016)
+Virtuozzo https://virtuozzo.com (2016)
+
+For a full list of sponsors, see
https://mariadb.org/about/supporters/
+and for individual contributors, see
+https://mariadb.org/donate/individual-sponsors/
-You can also do this by running SHOW CONTRIBUTORS.
+You can also get the list of sponsors by running SHOW CONTRIBUTORS.
-For all corporate memberships and sponsorships please contact the
+For all corporate sponsorships please contact the
MariaDB Foundation Board via foundation@mariadb.org.
The MariaDB Foundation is responsible for the MariaDB source
@@ -38,7 +40,7 @@ following services to the MariaDB community:
To be able to do the above we need help from corporations and individuals!
You can help support MariaDB by becoming a MariaDB developer or a
-member or sponsor of the MariaDB Foundation. To donate or sponsor,
+sponsor of the MariaDB Foundation. To donate or sponsor,
go to https://mariadb.org/donate/
You can get a list of all the main authors of MariaDB / MySQL by running
diff --git a/mysql-test/r/contributors.result b/mysql-test/r/contributors.result
index 1e01ca81990..03f5ad2ab15 100644
--- a/mysql-test/r/contributors.result
+++ b/mysql-test/r/contributors.result
@@ -1,13 +1,14 @@
SHOW CONTRIBUTORS;
Name Location Comment
-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
-Visma http://visma.com Member of the MariaDB Foundation
-Nexedi http://www.nexedi.com Member of the MariaDB Foundation
-Acronis http://www.acronis.com Member of the MariaDB Foundation
-Verkkokauppa.com Finland Sponsor of the MariaDB Foundation
-Virtuozzo https://virtuozzo.com/ Sponsor of the MariaDB Foundation
+Booking.com http://www.booking.com Founding member, Platinum Sponsor of the MariaDB Foundation
+MariaDB Corporation https://mariadb.com Founding member, Gold Sponsor of the MariaDB Foundation
+Visma http://visma.com Gold Sponsor of the MariaDB Foundation
+DBS http://dbs.com Gold Sponsor of the MariaDB Foundation
+Nexedi https://www.nexedi.com Silver Sponsor of the MariaDB Foundation
+Acronis http://www.acronis.com Silver Sponsor of the MariaDB Foundation
+Auttomattic https://automattic.com Bronze Sponsor of the MariaDB Foundation
+Verkkokauppa.com https://virtuozzo.com Bronze Sponsor of the MariaDB Foundation
+Virtuozzo https://virtuozzo.com/ Bronze Sponsor of the MariaDB Foundation
Google USA Sponsoring encryption, parallel replication and GTID
Facebook USA Sponsoring non-blocking API, LIMIT ROWS EXAMINED etc
Ronald Bradford Brisbane, Australia EFF contribution for UC2006 Auction
diff --git a/sql/contributors.h b/sql/contributors.h
index 76674d654e5..f52d3243453 100644
--- a/sql/contributors.h
+++ b/sql/contributors.h
@@ -36,17 +36,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"},
- {"MariaDB Corporation", "https://mariadb.com", "Founding member of the MariaDB Foundation"},
- {"Auttomattic", "http://automattic.com", "Member of the MariaDB Foundation"},
- {"Visma", "http://visma.com", "Member of the MariaDB Foundation"},
- {"Nexedi", "http://www.nexedi.com", "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"},
- {"Virtuozzo", "https://virtuozzo.com/", "Sponsor of the MariaDB Foundation"},
+ /* MariaDB foundation sponsors, in contribution, size , time order */
+ {"Booking.com", "http://www.booking.com", "Founding member, Platinum Sponsor of the MariaDB Foundation"},
+ {"MariaDB Corporation", "https://mariadb.com", "Founding member, Gold Sponsor of the MariaDB Foundation"},
+ {"Visma", "http://visma.com", "Gold Sponsor of the MariaDB Foundation"},
+ {"DBS", "http://dbs.com", "Gold Sponsor of the MariaDB Foundation"},
+ {"Nexedi", "https://www.nexedi.com", "Silver Sponsor of the MariaDB Foundation"},
+ {"Acronis", "http://www.acronis.com", "Silver Sponsor of the MariaDB Foundation"},
+ {"Auttomattic", "https://automattic.com", "Bronze Sponsor of the MariaDB Foundation"},
+ {"Verkkokauppa.com", "https://virtuozzo.com", "Bronze Sponsor of the MariaDB Foundation"},
+ {"Virtuozzo", "https://virtuozzo.com/", "Bronze Sponsor of the MariaDB Foundation"},
/* Sponsors of important features */
{"Google", "USA", "Sponsoring encryption, parallel replication and GTID"},