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

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

  1. c-change-2013-5.5
  2. Merge into 5.5
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: no longer in the source branch.
Merged at revision: 562
Proposed branch: lp:~laurynas-biveinis/percona-server/c-change-2013-5.5
Merge into: lp:percona-server/5.5
Diff against target: 176 lines (+18/-16)
13 files modified
Percona-Server/include/welcome_copyright_notice.h (+4/-2)
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.5
Reviewer Review Type Date Requested Status
Hrvoje Matijakovic Approve
Vadim Tkachenko Approve
Review via email: mp+181347@code.launchpad.net

Description of the change

Merge from 5.1 copyright notice update that replaces
"Copyright (c) 2009-2013 Percona Ireland Ltd."
with
"Copyright (c) 2009-2013 Percona LLC and/or its affiliates".

http://jenkins.percona.com/job/percona-server-5.5-param/828/

To post a comment you must log in.
Revision history for this message
Vadim Tkachenko (vadim-tk) :
review: Approve
Revision history for this message
Hrvoje Matijakovic (hrvojem) :
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-06-27 15:35:20 +0000
3+++ Percona-Server/include/welcome_copyright_notice.h 2013-08-21 16:15:58 +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/plugin/percona-pam-for-mysql/CMakeLists.txt'
23--- Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-06-14 07:38:47 +0000
24+++ Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-08-21 16:15:58 +0000
25@@ -1,4 +1,4 @@
26-# (C) 2011-2013 Percona Ireland Ltd.
27+# (C) 2011-2013 Percona LLC and/or its affiliates
28 #
29 # This program is free software; you can redistribute it and/or modify
30 # it under the terms of the GNU General Public License as published by
31
32=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/configure.ac'
33--- Percona-Server/plugin/percona-pam-for-mysql/configure.ac 2013-06-06 13:53:07 +0000
34+++ Percona-Server/plugin/percona-pam-for-mysql/configure.ac 2013-08-21 16:15:58 +0000
35@@ -1,5 +1,5 @@
36 # -*- Autoconf -*-
37-# (C) 2011-2013 Percona Ireland Ltd.
38+# (C) 2011-2013 Percona Percona LLC and/or its affiliates
39 #
40 # This program is free software; you can redistribute it and/or modify
41 # it under the terms of the GNU General Public License as published by
42
43=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am'
44--- Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am 2013-06-06 13:53:07 +0000
45+++ Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am 2013-08-21 16:15:58 +0000
46@@ -1,4 +1,4 @@
47-# (C) 2011-2013 Percona Ireland Ltd.
48+# (C) 2011-2013 Percona LLC and/or its affiliates
49 #
50 # This program is free software; you can redistribute it and/or modify
51 # it under the terms of the GNU General Public License as published by
52
53=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c'
54--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c 2013-06-14 06:50:45 +0000
55+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c 2013-08-21 16:15:58 +0000
56@@ -1,5 +1,5 @@
57 /*
58-(C) 2012, 2013 Percona Ireland Ltd.
59+(C) 2012, 2013 Percona LLC and/or its affiliates
60
61 This program is free software; you can redistribute it and/or modify
62 it under the terms of the GNU General Public License as published by
63
64=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h'
65--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h 2013-06-14 06:50:45 +0000
66+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h 2013-08-21 16:15:58 +0000
67@@ -1,7 +1,7 @@
68 #ifndef AUTH_MAPPING_INCLUDED
69 #define AUTH_MAPPING_INCLUDED
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_pam.c'
78--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c 2013-06-06 13:53:07 +0000
79+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c 2013-08-21 16:15:58 +0000
80@@ -1,5 +1,5 @@
81 /*
82-(C) 2012, 2013 Percona Ireland Ltd.
83+(C) 2012, 2013 Percona LLC and/or its affiliates
84
85 This program is free software; you can redistribute it and/or modify
86 it under the terms of the GNU General Public License as published by
87
88=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c'
89--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c 2013-06-06 13:53:07 +0000
90+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c 2013-08-21 16:15:58 +0000
91@@ -1,5 +1,5 @@
92 /*
93-(C) 2011-2013 Percona Ireland Ltd.
94+(C) 2011-2013 Percona LLC and/or its affiliates
95
96 This program is free software; you can redistribute it and/or modify
97 it under the terms of the GNU General Public License as published by
98
99=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c'
100--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c 2013-06-06 13:53:07 +0000
101+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c 2013-08-21 16:15:58 +0000
102@@ -1,5 +1,5 @@
103 /*
104-(C) 2012, 2013 Percona Ireland Ltd.
105+(C) 2012, 2013 Percona Percona LLC and/or its affiliates
106
107 This program is free software; you can redistribute it and/or modify
108 it under the terms of the GNU General Public License as published by
109
110=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/groups.c'
111--- Percona-Server/plugin/percona-pam-for-mysql/src/groups.c 2013-06-06 13:53:07 +0000
112+++ Percona-Server/plugin/percona-pam-for-mysql/src/groups.c 2013-08-21 16:15:58 +0000
113@@ -1,5 +1,5 @@
114 /*
115-(C) 2013 Percona Ireland Ltd.
116+(C) 2013 Percona LLC and/or its affiliates
117
118 This program is free software; you can redistribute it and/or modify
119 it under the terms of the GNU General Public License as published by
120
121=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/groups.h'
122--- Percona-Server/plugin/percona-pam-for-mysql/src/groups.h 2013-06-06 13:53:07 +0000
123+++ Percona-Server/plugin/percona-pam-for-mysql/src/groups.h 2013-08-21 16:15:58 +0000
124@@ -1,7 +1,7 @@
125 #ifndef AUTH_PAM_GROUPS_INCLUDED
126 #define AUTH_PAM_GROUPS_INCLUDED
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 'doc/source/conf.py'
135--- doc/source/conf.py 2013-08-14 03:52:04 +0000
136+++ doc/source/conf.py 2013-08-21 16:15:58 +0000
137@@ -45,7 +45,7 @@
138
139 # General information about the project.
140 project = u'Percona Server'
141-copyright = u'Percona Ireland Ltd. 2009-2013'
142+copyright = u'Percona LLC and/or its affiliates 2009-2013'
143
144 # The version info for the project you're documenting, acts as replacement for
145 # |version| and |release|, also used in various other places throughout the
146@@ -225,7 +225,7 @@
147 # (source start file, target name, title, author, documentclass [howto/manual]).
148 latex_documents = [
149 ('index', 'PerconaServer-5.5.tex', u'Percona Server Documentation',
150- u'Percona Ireland Ltd. 2009-2013', 'manual'),
151+ u'Percona LLC and/or its affiliates 2009-2013', 'manual'),
152 ]
153
154 # The name of an image file (relative to this directory) to place at the top of
155@@ -258,7 +258,7 @@
156 # (source start file, name, description, authors, manual section).
157 man_pages = [
158 ('index', 'perconaserver55', u'Percona Server 5.5 Documentation',
159- [u'Percona Ireland Ltd. 2009-2013'], 1)
160+ [u'Percona LLC and/or its affiliates 2009-2013'], 1)
161 ]
162
163
164
165=== modified file 'doc/source/copyright.rst'
166--- doc/source/copyright.rst 2013-06-12 05:29:59 +0000
167+++ doc/source/copyright.rst 2013-08-21 16:15:58 +0000
168@@ -6,7 +6,7 @@
169 Documentation Licensing
170 =======================
171
172-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.
173+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.
174
175 Software License
176 ================

Subscribers

People subscribed via source and target branches