Merge lp:~laurynas-biveinis/percona-server/c-change-2013-5.6 into lp:percona-server/5.6
Proposed by
Laurynas Biveinis
Status: | Merged |
---|---|
Approved by: | Hrvoje Matijakovic |
Approved revision: | no longer in the source branch. |
Merged at revision: | 412 |
Proposed branch: | lp:~laurynas-biveinis/percona-server/c-change-2013-5.6 |
Merge into: | lp:percona-server/5.6 |
Diff against target: |
189 lines (+19/-17) 14 files modified
Percona-Server/include/welcome_copyright_notice.h (+4/-2) Percona-Server/mysql-test/r/mysql_config_editor.result (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/configure.ac (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/groups.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/groups.h (+1/-1) doc/source/conf.py (+3/-3) doc/source/copyright.rst (+1/-1) |
To merge this branch: | bzr merge lp:~laurynas-biveinis/percona-server/c-change-2013-5.6 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vadim Tkachenko | Approve | ||
Hrvoje Matijakovic | Approve | ||
Review via email: mp+181348@code.launchpad.net |
Description of the change
http://
Merge from 5.5 copyright notice update that replaces
"Copyright (c) 2009-2013 Percona Ireland Ltd."
with
"Copyright (c) 2009-2013 Percona LLC and/or its affiliates".
To post a comment you must log in.