Percona XtraBackup moved to https://jira.percona.com/projects/PXB

Merge lp:~ignacio-nin/percona-xtrabackup/2.0-bug1222777 into lp:percona-xtrabackup/2.0

  1. 2.0-bug1222777
  2. Merge into 2.0
Proposed by Ignacio Nin
Status: Work in progress
Proposed branch: lp:~ignacio-nin/percona-xtrabackup/2.0-bug1222777
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 242 lines (+19/-19)
18 files modified
COPYING (+2/-2)
src/buffer.c (+1/-1)
src/buffer.h (+1/-1)
src/common.h (+1/-1)
src/compress.c (+1/-1)
src/compress.h (+1/-1)
src/datasink.h (+1/-1)
src/local.c (+1/-1)
src/local.h (+1/-1)
src/stream.c (+1/-1)
src/stream.h (+1/-1)
src/xb_regex.h (+1/-1)
src/xbstream.c (+1/-1)
src/xbstream.h (+1/-1)
src/xbstream_read.c (+1/-1)
src/xbstream_write.c (+1/-1)
src/xtrabackup.cc (+1/-1)
test/python/subunit/tests/TestUtil.py (+1/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-xtrabackup/2.0-bug1222777
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Needs Fixing
Review via email: mp+184638@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

test/python/subunit/tests/TestUtil.py is not copyrighted by Percona, so should be left intact.

review: Needs Fixing
Reply

Unmerged revisions

587. By Ignacio Nin

Update FSF's street address

The copyright notices were showing an outdated FSF's street address.
Update to the new address as per http://www.gnu.org/licenses/gpl-2.0.html

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'COPYING'
2--- COPYING 2010-10-01 05:14:47 +0000
3+++ COPYING 2013-09-09 17:43:09 +0000
4@@ -2,7 +2,7 @@
5 Version 2, June 1991
6
7 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
8- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
9+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
10
11 Everyone is permitted to copy and distribute verbatim copies
12 of this license document, but changing it is not allowed.
13@@ -316,7 +316,7 @@
14
15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software
17- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19
20 Also add information on how to contact you by electronic and paper mail.
21
22
23=== modified file 'src/buffer.c'
24--- src/buffer.c 2013-08-18 06:53:11 +0000
25+++ src/buffer.c 2013-09-09 17:43:09 +0000
26@@ -14,7 +14,7 @@
27
28 You should have received a copy of the GNU General Public License
29 along with this program; if not, write to the Free Software
30-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
31+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
32
33 *******************************************************/
34
35
36=== modified file 'src/buffer.h'
37--- src/buffer.h 2013-08-18 06:53:11 +0000
38+++ src/buffer.h 2013-09-09 17:43:09 +0000
39@@ -14,7 +14,7 @@
40
41 You should have received a copy of the GNU General Public License
42 along with this program; if not, write to the Free Software
43-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
44+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
45
46 *******************************************************/
47
48
49=== modified file 'src/common.h'
50--- src/common.h 2013-08-18 06:53:11 +0000
51+++ src/common.h 2013-09-09 17:43:09 +0000
52@@ -14,7 +14,7 @@
53
54 You should have received a copy of the GNU General Public License
55 along with this program; if not, write to the Free Software
56-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
57+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
58
59 *******************************************************/
60
61
62=== modified file 'src/compress.c'
63--- src/compress.c 2013-08-18 06:53:11 +0000
64+++ src/compress.c 2013-09-09 17:43:09 +0000
65@@ -14,7 +14,7 @@
66
67 You should have received a copy of the GNU General Public License
68 along with this program; if not, write to the Free Software
69-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
70+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
71
72 *******************************************************/
73
74
75=== modified file 'src/compress.h'
76--- src/compress.h 2013-08-18 06:53:11 +0000
77+++ src/compress.h 2013-09-09 17:43:09 +0000
78@@ -14,7 +14,7 @@
79
80 You should have received a copy of the GNU General Public License
81 along with this program; if not, write to the Free Software
82-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
83+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
84
85 *******************************************************/
86
87
88=== modified file 'src/datasink.h'
89--- src/datasink.h 2013-08-18 06:53:11 +0000
90+++ src/datasink.h 2013-09-09 17:43:09 +0000
91@@ -14,7 +14,7 @@
92
93 You should have received a copy of the GNU General Public License
94 along with this program; if not, write to the Free Software
95-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
96+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
97
98 *******************************************************/
99
100
101=== modified file 'src/local.c'
102--- src/local.c 2013-08-18 06:53:11 +0000
103+++ src/local.c 2013-09-09 17:43:09 +0000
104@@ -14,7 +14,7 @@
105
106 You should have received a copy of the GNU General Public License
107 along with this program; if not, write to the Free Software
108-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
109+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
110
111 *******************************************************/
112
113
114=== modified file 'src/local.h'
115--- src/local.h 2013-08-18 06:53:11 +0000
116+++ src/local.h 2013-09-09 17:43:09 +0000
117@@ -14,7 +14,7 @@
118
119 You should have received a copy of the GNU General Public License
120 along with this program; if not, write to the Free Software
121-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
122+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
123
124 *******************************************************/
125
126
127=== modified file 'src/stream.c'
128--- src/stream.c 2013-08-18 06:53:11 +0000
129+++ src/stream.c 2013-09-09 17:43:09 +0000
130@@ -14,7 +14,7 @@
131
132 You should have received a copy of the GNU General Public License
133 along with this program; if not, write to the Free Software
134-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
135+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
136
137 *******************************************************/
138
139
140=== modified file 'src/stream.h'
141--- src/stream.h 2013-08-18 06:53:11 +0000
142+++ src/stream.h 2013-09-09 17:43:09 +0000
143@@ -14,7 +14,7 @@
144
145 You should have received a copy of the GNU General Public License
146 along with this program; if not, write to the Free Software
147-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
148+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
149
150 *******************************************************/
151
152
153=== modified file 'src/xb_regex.h'
154--- src/xb_regex.h 2013-08-18 06:53:11 +0000
155+++ src/xb_regex.h 2013-09-09 17:43:09 +0000
156@@ -12,7 +12,7 @@
157
158 You should have received a copy of the GNU General Public License
159 along with this program; if not, write to the Free Software
160-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
161+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
162
163 *******************************************************/
164
165
166=== modified file 'src/xbstream.c'
167--- src/xbstream.c 2013-08-18 06:53:11 +0000
168+++ src/xbstream.c 2013-09-09 17:43:09 +0000
169@@ -14,7 +14,7 @@
170
171 You should have received a copy of the GNU General Public License
172 along with this program; if not, write to the Free Software
173-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
174+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
175
176 *******************************************************/
177
178
179=== modified file 'src/xbstream.h'
180--- src/xbstream.h 2013-08-18 06:53:11 +0000
181+++ src/xbstream.h 2013-09-09 17:43:09 +0000
182@@ -14,7 +14,7 @@
183
184 You should have received a copy of the GNU General Public License
185 along with this program; if not, write to the Free Software
186-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
187+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
188
189 *******************************************************/
190
191
192=== modified file 'src/xbstream_read.c'
193--- src/xbstream_read.c 2013-08-18 06:53:11 +0000
194+++ src/xbstream_read.c 2013-09-09 17:43:09 +0000
195@@ -14,7 +14,7 @@
196
197 You should have received a copy of the GNU General Public License
198 along with this program; if not, write to the Free Software
199-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
200+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
201
202 *******************************************************/
203
204
205=== modified file 'src/xbstream_write.c'
206--- src/xbstream_write.c 2013-08-18 06:53:11 +0000
207+++ src/xbstream_write.c 2013-09-09 17:43:09 +0000
208@@ -14,7 +14,7 @@
209
210 You should have received a copy of the GNU General Public License
211 along with this program; if not, write to the Free Software
212-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
213+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
214
215 *******************************************************/
216
217
218=== modified file 'src/xtrabackup.cc'
219--- src/xtrabackup.cc 2013-08-18 06:53:11 +0000
220+++ src/xtrabackup.cc 2013-09-09 17:43:09 +0000
221@@ -16,7 +16,7 @@
222
223 You should have received a copy of the GNU General Public License
224 along with this program; if not, write to the Free Software
225-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
226+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
227
228 *******************************************************
229
230
231=== modified file 'test/python/subunit/tests/TestUtil.py'
232--- test/python/subunit/tests/TestUtil.py 2011-06-10 07:21:52 +0000
233+++ test/python/subunit/tests/TestUtil.py 2013-09-09 17:43:09 +0000
234@@ -13,7 +13,7 @@
235 #
236 # You should have received a copy of the GNU General Public License
237 # along with this program; if not, write to the Free Software
238-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
239+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
240 #
241
242 import sys

Subscribers

People subscribed via source and target branches