From 5dde6c57ba11512aa8d04cb3386bae33e8721bd8 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 16 Dec 2014 21:30:27 +0200 Subject: [PATCH] Replace VMware copyright notices with PGDG ones. Also update the copyright years to 2014 while we're at it. --- contrib/pg_rewind/Makefile | 2 +- contrib/pg_rewind/copy_fetch.c | 3 +-- contrib/pg_rewind/datapagemap.c | 2 +- contrib/pg_rewind/datapagemap.h | 2 +- contrib/pg_rewind/fetch.c | 3 +-- contrib/pg_rewind/fetch.h | 2 +- contrib/pg_rewind/filemap.c | 2 +- contrib/pg_rewind/filemap.h | 2 +- contrib/pg_rewind/libpq_fetch.c | 3 +-- contrib/pg_rewind/parsexlog.c | 3 +-- contrib/pg_rewind/pg_rewind.c | 3 +-- contrib/pg_rewind/pg_rewind.h | 3 +-- contrib/pg_rewind/timeline.c | 3 +-- contrib/pg_rewind/util.c | 2 +- contrib/pg_rewind/util.h | 2 +- 15 files changed, 15 insertions(+), 22 deletions(-) diff --git a/contrib/pg_rewind/Makefile b/contrib/pg_rewind/Makefile index d50a8cf35c..1b2d2b9869 100644 --- a/contrib/pg_rewind/Makefile +++ b/contrib/pg_rewind/Makefile @@ -1,6 +1,6 @@ # Makefile for pg_rewind # -# Copyright (c) 2013 VMware, Inc. All Rights Reserved. +# Copyright (c) 2013-2014, PostgreSQL Global Development Group # PGFILEDESC = "pg_rewind - repurpose an old master server as standby" diff --git a/contrib/pg_rewind/copy_fetch.c b/contrib/pg_rewind/copy_fetch.c index e466ad1e3b..5c40ec71f4 100644 --- a/contrib/pg_rewind/copy_fetch.c +++ b/contrib/pg_rewind/copy_fetch.c @@ -3,8 +3,7 @@ * copy_fetch.c * Functions for copying a PostgreSQL data directory * - * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group - * Portions Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group * *------------------------------------------------------------------------- */ diff --git a/contrib/pg_rewind/datapagemap.c b/contrib/pg_rewind/datapagemap.c index 25284b7080..c1a956b758 100644 --- a/contrib/pg_rewind/datapagemap.c +++ b/contrib/pg_rewind/datapagemap.c @@ -3,7 +3,7 @@ * * This is a fairly simple bitmap. * - * Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Copyright (c) 2013-2014, PostgreSQL Global Development Group */ #include "postgres_fe.h" diff --git a/contrib/pg_rewind/datapagemap.h b/contrib/pg_rewind/datapagemap.h index b9a2cd2e4e..3f04d81ea4 100644 --- a/contrib/pg_rewind/datapagemap.h +++ b/contrib/pg_rewind/datapagemap.h @@ -2,7 +2,7 @@ * * datapagemap.h * - * Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Copyright (c) 2013-2014, PostgreSQL Global Development Group *------------------------------------------------------------------------- */ #ifndef DATAPAGEMAP_H diff --git a/contrib/pg_rewind/fetch.c b/contrib/pg_rewind/fetch.c index 7feba257f1..ed05f953f8 100644 --- a/contrib/pg_rewind/fetch.c +++ b/contrib/pg_rewind/fetch.c @@ -10,8 +10,7 @@ * connection (libpq_fetch.c) * * - * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group - * Portions Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group * *------------------------------------------------------------------------- */ diff --git a/contrib/pg_rewind/fetch.h b/contrib/pg_rewind/fetch.h index 8a302a7a51..b368915d0c 100644 --- a/contrib/pg_rewind/fetch.h +++ b/contrib/pg_rewind/fetch.h @@ -8,7 +8,7 @@ * directory (copy method), or a remote PostgreSQL server (libpq fetch * method). * - * Portions Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Copyright (c) 2013-2014, PostgreSQL Global Development Group * *------------------------------------------------------------------------- */ diff --git a/contrib/pg_rewind/filemap.c b/contrib/pg_rewind/filemap.c index c2ca80c590..48baf60396 100644 --- a/contrib/pg_rewind/filemap.c +++ b/contrib/pg_rewind/filemap.c @@ -1,7 +1,7 @@ /* * A data structure for keeping track of files that have changed. * - * Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Copyright (c) 2013-2014, PostgreSQL Global Development Group */ #include "postgres_fe.h" diff --git a/contrib/pg_rewind/filemap.h b/contrib/pg_rewind/filemap.h index 342f4c8ab7..9c834fd7bd 100644 --- a/contrib/pg_rewind/filemap.h +++ b/contrib/pg_rewind/filemap.h @@ -2,7 +2,7 @@ * * filemap.h * - * Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Copyright (c) 2013-2014, PostgreSQL Global Development Group *------------------------------------------------------------------------- */ #ifndef FILEMAP_H diff --git a/contrib/pg_rewind/libpq_fetch.c b/contrib/pg_rewind/libpq_fetch.c index c281714656..716814bb1b 100644 --- a/contrib/pg_rewind/libpq_fetch.c +++ b/contrib/pg_rewind/libpq_fetch.c @@ -3,8 +3,7 @@ * libpq_fetch.c * Functions for fetching files from a remote server. * - * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group - * Portions Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Copyright (c) 2013-2014, PostgreSQL Global Development Group * *------------------------------------------------------------------------- */ diff --git a/contrib/pg_rewind/parsexlog.c b/contrib/pg_rewind/parsexlog.c index c88d6e81e9..bc8ad10c0a 100644 --- a/contrib/pg_rewind/parsexlog.c +++ b/contrib/pg_rewind/parsexlog.c @@ -3,8 +3,7 @@ * parsexlog.c * Functions for reading Write-Ahead-Log * - * Portions Copyright (c) 2013 VMware, Inc. All Rights Reserved. - * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group + * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, Nippon Telegraph and Telephone Corporation * Portions Copyright (c) 1994, Regents of the University of California * diff --git a/contrib/pg_rewind/pg_rewind.c b/contrib/pg_rewind/pg_rewind.c index 2fbf88a9b9..e08d1eaee6 100644 --- a/contrib/pg_rewind/pg_rewind.c +++ b/contrib/pg_rewind/pg_rewind.c @@ -3,8 +3,7 @@ * pg_rewind.c * Synchronizes an old master server to a new timeline * - * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group - * Portions Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group * *------------------------------------------------------------------------- */ diff --git a/contrib/pg_rewind/pg_rewind.h b/contrib/pg_rewind/pg_rewind.h index 8b7b5d8cad..3fe72a84c6 100644 --- a/contrib/pg_rewind/pg_rewind.h +++ b/contrib/pg_rewind/pg_rewind.h @@ -3,9 +3,8 @@ * pg_rewind.h * * - * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group + * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California - * Portions Copyright (c) 2013 VMware, Inc. All Rights Reserved. * *------------------------------------------------------------------------- */ diff --git a/contrib/pg_rewind/timeline.c b/contrib/pg_rewind/timeline.c index e96d010375..b626eb2da6 100644 --- a/contrib/pg_rewind/timeline.c +++ b/contrib/pg_rewind/timeline.c @@ -3,8 +3,7 @@ * timeline.c * timeline-related functions. * - * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group - * Portions Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group * *------------------------------------------------------------------------- */ diff --git a/contrib/pg_rewind/util.c b/contrib/pg_rewind/util.c index 0261fee3e5..6e884bbb89 100644 --- a/contrib/pg_rewind/util.c +++ b/contrib/pg_rewind/util.c @@ -3,7 +3,7 @@ * util.c * Misc utility functions * - * Portions Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Copyright (c) 2013-2014, PostgreSQL Global Development Group * *------------------------------------------------------------------------- */ diff --git a/contrib/pg_rewind/util.h b/contrib/pg_rewind/util.h index 205c55c96c..c722648c4c 100644 --- a/contrib/pg_rewind/util.h +++ b/contrib/pg_rewind/util.h @@ -3,7 +3,7 @@ * util.h * Prototypes for functions in util.c * - * Portions Copyright (c) 2013 VMware, Inc. All Rights Reserved. + * Copyright (c) 2013-2014, PostgreSQL Global Development Group *------------------------------------------------------------------------- */ #ifndef UTIL_H -- 2.39.5