Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~laurynas-biveinis/percona-server/c-change-2013-5.6 into lp:percona-server/5.6

  1. c-change-2013-5.6
  2. Merge into 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
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://jenkins.percona.com/job/percona-server-5.6-param/227/

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.
Revision history for this message
Hrvoje Matijakovic (hrvojem) :
review: Approve
Revision history for this message
Vadim Tkachenko (vadim-tk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/include/welcome_copyright_notice.h'
2--- Percona-Server/include/welcome_copyright_notice.h 2013-08-14 03:57:21 +0000
3+++ Percona-Server/include/welcome_copyright_notice.h 2013-08-21 16:17:01 +0000
4@@ -24,12 +24,14 @@
5 */
6 #define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \
7 (strcmp(first_year, COPYRIGHT_NOTICE_CURRENT_YEAR) ? \
8- "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR " Percona Ireland Ltd.\n" \
9+ "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR \
10+ " Percona LLC and/or its affiliates\n" \
11 "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR ", " \
12 "Oracle and/or its affiliates. All rights reserved.\n\nOracle is a " \
13 "registered trademark of Oracle Corporation and/or its\naffiliates. " \
14 "Other names may be trademarks of their respective\nowners.\n" : \
15- "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR " Percona Ireland Ltd.\n" \
16+ "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR \
17+ " Percona LLC and/or its affiliates\n" \
18 "Copyright (c) " first_year ", Oracle and/or its affiliates. " \
19 "All rights reserved.\n\nOracle is a registered trademark of " \
20 "Oracle Corporation and/or its\naffiliates. Other names may be " \
21
22=== modified file 'Percona-Server/mysql-test/r/mysql_config_editor.result'
23--- Percona-Server/mysql-test/r/mysql_config_editor.result 2013-06-12 07:29:33 +0000
24+++ Percona-Server/mysql-test/r/mysql_config_editor.result 2013-08-21 16:17:01 +0000
25@@ -100,7 +100,7 @@
26 ##############################################
27 # Tests for mysql_config_editor's help command
28 ##############################################
29-Copyright (c) 2009-2013 Percona Ireland Ltd.
30+Copyright (c) 2009-2013 Percona LLC and/or its affiliates
31 Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
32
33 Oracle is a registered trademark of Oracle Corporation and/or its
34
35=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt'
36--- Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-06-14 07:38:47 +0000
37+++ Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-08-21 16:17:01 +0000
38@@ -1,4 +1,4 @@
39-# (C) 2011-2013 Percona Ireland Ltd.
40+# (C) 2011-2013 Percona LLC and/or its affiliates
41 #
42 # This program is free software; you can redistribute it and/or modify
43 # it under the terms of the GNU General Public License as published by
44
45=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/configure.ac'
46--- Percona-Server/plugin/percona-pam-for-mysql/configure.ac 2013-06-06 13:53:07 +0000
47+++ Percona-Server/plugin/percona-pam-for-mysql/configure.ac 2013-08-21 16:17:01 +0000
48@@ -1,5 +1,5 @@
49 # -*- Autoconf -*-
50-# (C) 2011-2013 Percona Ireland Ltd.
51+# (C) 2011-2013 Percona Percona LLC and/or its affiliates
52 #
53 # This program is free software; you can redistribute it and/or modify
54 # it under the terms of the GNU General Public License as published by
55
56=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am'
57--- Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am 2013-06-06 13:53:07 +0000
58+++ Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am 2013-08-21 16:17:01 +0000
59@@ -1,4 +1,4 @@
60-# (C) 2011-2013 Percona Ireland Ltd.
61+# (C) 2011-2013 Percona LLC and/or its affiliates
62 #
63 # This program is free software; you can redistribute it and/or modify
64 # it under the terms of the GNU General Public License as published by
65
66=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c'
67--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c 2013-06-14 06:50:45 +0000
68+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c 2013-08-21 16:17:01 +0000
69@@ -1,5 +1,5 @@
70 /*
71-(C) 2012, 2013 Percona Ireland Ltd.
72+(C) 2012, 2013 Percona LLC and/or its affiliates
73
74 This program is free software; you can redistribute it and/or modify
75 it under the terms of the GNU General Public License as published by
76
77=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h'
78--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h 2013-06-14 06:50:45 +0000
79+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h 2013-08-21 16:17:01 +0000
80@@ -1,7 +1,7 @@
81 #ifndef AUTH_MAPPING_INCLUDED
82 #define AUTH_MAPPING_INCLUDED
83 /*
84- (C) 2012, 2013 Percona Ireland Ltd.
85+ (C) 2012, 2013 Percona LLC and/or its affiliates
86
87 This program is free software; you can redistribute it and/or modify
88 it under the terms of the GNU General Public License as published by
89
90=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c'
91--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c 2013-06-06 13:53:07 +0000
92+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c 2013-08-21 16:17:01 +0000
93@@ -1,5 +1,5 @@
94 /*
95-(C) 2012, 2013 Percona Ireland Ltd.
96+(C) 2012, 2013 Percona LLC and/or its affiliates
97
98 This program is free software; you can redistribute it and/or modify
99 it under the terms of the GNU General Public License as published by
100
101=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c'
102--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c 2013-06-06 13:53:07 +0000
103+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c 2013-08-21 16:17:01 +0000
104@@ -1,5 +1,5 @@
105 /*
106-(C) 2011-2013 Percona Ireland Ltd.
107+(C) 2011-2013 Percona LLC and/or its affiliates
108
109 This program is free software; you can redistribute it and/or modify
110 it under the terms of the GNU General Public License as published by
111
112=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c'
113--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c 2013-06-06 13:53:07 +0000
114+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c 2013-08-21 16:17:01 +0000
115@@ -1,5 +1,5 @@
116 /*
117-(C) 2012, 2013 Percona Ireland Ltd.
118+(C) 2012, 2013 Percona Percona LLC and/or its affiliates
119
120 This program is free software; you can redistribute it and/or modify
121 it under the terms of the GNU General Public License as published by
122
123=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/groups.c'
124--- Percona-Server/plugin/percona-pam-for-mysql/src/groups.c 2013-06-06 13:53:07 +0000
125+++ Percona-Server/plugin/percona-pam-for-mysql/src/groups.c 2013-08-21 16:17:01 +0000
126@@ -1,5 +1,5 @@
127 /*
128-(C) 2013 Percona Ireland Ltd.
129+(C) 2013 Percona LLC and/or its affiliates
130
131 This program is free software; you can redistribute it and/or modify
132 it under the terms of the GNU General Public License as published by
133
134=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/groups.h'
135--- Percona-Server/plugin/percona-pam-for-mysql/src/groups.h 2013-06-06 13:53:07 +0000
136+++ Percona-Server/plugin/percona-pam-for-mysql/src/groups.h 2013-08-21 16:17:01 +0000
137@@ -1,7 +1,7 @@
138 #ifndef AUTH_PAM_GROUPS_INCLUDED
139 #define AUTH_PAM_GROUPS_INCLUDED
140 /*
141- (C) 2013 Percona Ireland Ltd.
142+ (C) 2013 Percona LLC and/or its affiliates
143
144 This program is free software; you can redistribute it and/or modify
145 it under the terms of the GNU General Public License as published by
146
147=== modified file 'doc/source/conf.py'
148--- doc/source/conf.py 2013-08-14 03:57:21 +0000
149+++ doc/source/conf.py 2013-08-21 16:17:01 +0000
150@@ -45,7 +45,7 @@
151
152 # General information about the project.
153 project = u'Percona Server'
154-copyright = u'Percona Ireland Ltd. 2009-2013'
155+copyright = u'Percona LLC and/or its affiliates 2009-2013'
156
157 # The version info for the project you're documenting, acts as replacement for
158 # |version| and |release|, also used in various other places throughout the
159@@ -226,7 +226,7 @@
160 # (source start file, target name, title, author, documentclass [howto/manual]).
161 latex_documents = [
162 ('index', 'PerconaServer-5.6.tex', u'Percona Server Documentation',
163- u'Percona Ireland Ltd. 2009-2013', 'manual'),
164+ u'Percona LLC and/or its affiliates 2009-2013', 'manual'),
165 ]
166
167 # The name of an image file (relative to this directory) to place at the top of
168@@ -259,7 +259,7 @@
169 # (source start file, name, description, authors, manual section).
170 man_pages = [
171 ('index', 'perconaserver56', u'Percona Server 5.6 Documentation',
172- [u'Percona Ireland Ltd. 2009-2013'], 1)
173+ [u'Percona LLC and/or its affiliates 2009-2013'], 1)
174 ]
175
176
177
178=== modified file 'doc/source/copyright.rst'
179--- doc/source/copyright.rst 2013-06-12 05:29:59 +0000
180+++ doc/source/copyright.rst 2013-08-21 16:17:01 +0000
181@@ -6,7 +6,7 @@
182 Documentation Licensing
183 =======================
184
185-This software documentation is (C)2009-2013 Percona Ireland Ltd. and is distributed under the `Creative Commons Attribution-ShareAlike 2.0 Generic <http://creativecommons.org/licenses/by-sa/2.0/>`_ license.
186+This software documentation is (C)2009-2013 Percona LLC and/or its affiliates and is distributed under the `Creative Commons Attribution-ShareAlike 2.0 Generic <http://creativecommons.org/licenses/by-sa/2.0/>`_ license.
187
188 Software License
189 ================

Subscribers

People subscribed via source and target branches