diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
| commit | da4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch) | |
| tree | 7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /wsrep | |
| parent | 9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff) | |
| parent | a00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff) | |
| download | mariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'wsrep')
| -rw-r--r-- | wsrep/wsrep_dummy.c | 2 | ||||
| -rw-r--r-- | wsrep/wsrep_gtid.c | 2 | ||||
| -rw-r--r-- | wsrep/wsrep_loader.c | 2 | ||||
| -rw-r--r-- | wsrep/wsrep_uuid.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/wsrep/wsrep_dummy.c b/wsrep/wsrep_dummy.c index eae084f1979..e48dcff39a1 100644 --- a/wsrep/wsrep_dummy.c +++ b/wsrep/wsrep_dummy.c @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*! @file Dummy wsrep API implementation. */ diff --git a/wsrep/wsrep_gtid.c b/wsrep/wsrep_gtid.c index e618c5ab7d0..45148785c25 100644 --- a/wsrep/wsrep_gtid.c +++ b/wsrep/wsrep_gtid.c @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*! @file Helper functions to deal with GTID string representations */ diff --git a/wsrep/wsrep_loader.c b/wsrep/wsrep_loader.c index f4d5991339e..1321538742f 100644 --- a/wsrep/wsrep_loader.c +++ b/wsrep/wsrep_loader.c @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*! @file wsrep implementation loader */ diff --git a/wsrep/wsrep_uuid.c b/wsrep/wsrep_uuid.c index baa95b2578a..54ae4ab5ed5 100644 --- a/wsrep/wsrep_uuid.c +++ b/wsrep/wsrep_uuid.c @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*! @file Helper functions to deal with history UUID string representations */ |