Merge lp:~hingo/drizzle/authors-intro into lp:~drizzle-trunk/drizzle/development

Proposed by Henrik Ingo on 2012-03-18
Status: Merged
Merged at revision: 2530
Proposed branch: lp:~hingo/drizzle/authors-intro
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 14 lines (+4/-3)
1 file modified
AUTHORS (+4/-3)
To merge this branch: bzr merge lp:~hingo/drizzle/authors-intro
Reviewer Review Type Date Requested Status
Drizzle Merge Team 2012-03-18 Pending
Review via email:

Commit message

Updated intro in AUTHORS.

Description of the change

Updated intro in AUTHORS file.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2012-03-17 12:49:29 +0000
3+++ AUTHORS 2012-03-18 06:22:20 +0000
4@@ -1,6 +1,7 @@
5-All code descends from the work by Michael Widenius and David Axmark the original authors.
6-Many others from MySQL AB have participated in the creation of this as well,
7-Please see "SHOW AUTHORS" in MySQL 5.1 for a complete list of names.
8+Drizzle is a descendant of the MySQL database, created by Michael Widenius and
9+David Axmark, and developed for many years by MySQL AB and Sun Microsystems Inc.
10+The below list contains authors of MySQL until the time of 5.1, when Drizzle
11+was forked, and the authors of Drizzle code.
12 -----------
13 Andrew Ettinger
14 Andrew Garner