diff options
author | Pavan Deolasee | 2017-08-18 05:43:32 +0000 |
---|---|---|
committer | Pavan Deolasee | 2017-08-18 05:43:32 +0000 |
commit | eea51611515116fd3eff1ab795c9f2fdcf6a08cc (patch) | |
tree | 4d3e9eab417d94912201967edc679854d3ad9267 /src/common/sha2.c | |
parent | 0b69492af7186538d831823a6fce3b64616be197 (diff) | |
parent | 21d304dfedb4f26d0d6587d9ac39b1b5c499bb55 (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/common/sha2.c')
-rw-r--r-- | src/common/sha2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/sha2.c b/src/common/sha2.c index 7c6f1b49ad..d7992f1d20 100644 --- a/src/common/sha2.c +++ b/src/common/sha2.c @@ -6,7 +6,7 @@ * This is the set of in-core functions used when there are no other * alternative options like OpenSSL. * - * Portions Copyright (c) 2016, PostgreSQL Global Development Group + * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group * * IDENTIFICATION * src/common/sha2.c |