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/backend/access/transam/commit_ts.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/backend/access/transam/commit_ts.c')
| -rw-r--r-- | src/backend/access/transam/commit_ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c index 555f7cafd1..3414c37ede 100644 --- a/src/backend/access/transam/commit_ts.c +++ b/src/backend/access/transam/commit_ts.c @@ -621,7 +621,7 @@ CommitTsParameterChange(bool newvalue, bool oldvalue) * * The reason why this SLRU needs separate activation/deactivation functions is * that it can be enabled/disabled during start and the activation/deactivation - * on master is propagated to slave via replay. Other SLRUs don't have this + * on master is propagated to standby via replay. Other SLRUs don't have this * property and they can be just initialized during normal startup. * * This is in charge of creating the currently active segment, if it's not |