Replace VMware copyright notices with PGDG ones.

Also update the copyright years to 2014 while we're at it.

diff --git a/contrib/pg_rewind/Makefile b/contrib/pg_rewind/Makefile
index d50a8cf35c3a3bc7613bcbd9597581b6bc9873c1..1b2d2b9869daa001fa5cbac279f2c24d9eaed08c 100644 (file)
--- 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 e466ad1e3b6e10d63f2f147c00c0d608e7456f3f..5c40ec71f4a2cd976fb3fea0d72a9dff305141a6 100644 (file)
--- 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 25284b70805a05ecda134014bd65bfac3e8c6096..c1a956b7581e800ad6d3a7ed2a110ecf3346155e 100644 (file)
--- 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 b9a2cd2e4ebff19f913c3fd9bcdd52066a7436a5..3f04d81ea49a6e80ed869088bae29f2647839835 100644 (file)
--- 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 7feba257f1960d830dc3ed4316cea1b6e24c06b2..ed05f953f83a4281a8c41cd151e2ff9d98cae766 100644 (file)
--- 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 8a302a7a51ad5113d959f873fb757133c96179a8..b368915d0cdf1751f5aceddc41751baf11bdd35d 100644 (file)
--- 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 c2ca80c590d5dbf889310e208538eb5b90f0aa60..48baf60396d040a4a1af6dffc88dd3e414cc7695 100644 (file)
--- 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 342f4c8ab7cf0e584998d2c6cc7a486ff147163b..9c834fd7bd7b53ad16f2a4798f02450ce780b206 100644 (file)
--- 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 c281714656800c8f1b4b46a6b548fc3c9a87affe..716814bb1b5ea390bee6b87f99ad2f04fe21b8bc 100644 (file)
--- 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 c88d6e81e91778d09d5e219bbf75e23e3afed5b8..bc8ad10c0adfc1e6ce23e0c836e47495f45ec228 100644 (file)
--- 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 2fbf88a9b939f6afeafb50560ad4497e01bc6eed..e08d1eaee6b8b7547423f58a31215e93ea603371 100644 (file)
--- 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 8b7b5d8cad17ef1096f129993187a33503e19039..3fe72a84c60ade23c626a38a3699b8b0ddbc6ea5 100644 (file)
--- 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 e96d0103753110441b66ec2a301ad0638efcd939..b626eb2da6d154ccbbd5d8ed9ee4742c858b26c8 100644 (file)
--- 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 0261fee3e599579725370cc410886c607cbcfe23..6e884bbb89d4f7202f50ca1f5f06e04fdc983b2a 100644 (file)
--- 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 205c55c96c148796cf6450c10e99a39454c87091..c722648c4c00b3c9602024c4af550dc799d4d88b 100644 (file)
--- 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