summaryrefslogtreecommitdiff
path: root/src/include/common
diff options
context:
space:
mode:
authorPavan Deolasee2017-08-18 05:43:32 +0000
committerPavan Deolasee2017-08-18 05:43:32 +0000
commiteea51611515116fd3eff1ab795c9f2fdcf6a08cc (patch)
tree4d3e9eab417d94912201967edc679854d3ad9267 /src/include/common
parent0b69492af7186538d831823a6fce3b64616be197 (diff)
parent21d304dfedb4f26d0d6587d9ac39b1b5c499bb55 (diff)
Merge commit '21d304dfedb4f26d0d6587d9ac39b1b5c499bb55'
This is the merge-base of PostgreSQL's master branch and REL_10_STABLE branch. This should be the last merge from PG's master branch into XL 10 branch. Subsequent merges must happen from REL_10_STABLE branch
Diffstat (limited to 'src/include/common')
-rw-r--r--src/include/common/sha2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/common/sha2.h b/src/include/common/sha2.h
index 6358ca3c56..a31b3979d8 100644
--- a/src/include/common/sha2.h
+++ b/src/include/common/sha2.h
@@ -3,7 +3,7 @@
* sha2.h
* Generic headers for SHA224, 256, 384 AND 512 functions of PostgreSQL.
*
- * Portions Copyright (c) 2016, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
*
* IDENTIFICATION
* src/include/common/sha2.h