diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-12-08 07:30:37 -0500 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-12-08 07:30:37 -0500 |
| commit | 8d3fcda18b02d460e2d8c9ace6608778b57833e7 (patch) | |
| tree | 8d29fb78a7110e7dd248c061cc1a3bd6c48ad694 /dist | |
| parent | 001d39b123b412b1346144b61d153e23886901cf (diff) | |
| parent | cff86984cd58323f726feb8b9345e0de6babc5a3 (diff) | |
| download | mongo-8d3fcda18b02d460e2d8c9ace6608778b57833e7.tar.gz | |
Merge branch 'develop' into WT-2262
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/package/wiredtiger.spec | 2 | ||||
| -rwxr-xr-x | dist/s_docs | 3 | ||||
| -rwxr-xr-x | dist/s_string | 3 | ||||
| -rw-r--r-- | dist/s_string.ok | 5 |
4 files changed, 10 insertions, 3 deletions
diff --git a/dist/package/wiredtiger.spec b/dist/package/wiredtiger.spec index 6c7d6b9bc41..5bbb26885c0 100644 --- a/dist/package/wiredtiger.spec +++ b/dist/package/wiredtiger.spec @@ -1,5 +1,5 @@ Name: wiredtiger -Version: 2.7.0 +Version: 2.7.1 Release: 1%{?dist} Summary: WiredTiger data storage engine diff --git a/dist/s_docs b/dist/s_docs index 96cacd3fb34..c66bcb0bd06 100755 --- a/dist/s_docs +++ b/dist/s_docs @@ -22,7 +22,8 @@ changelog() (echo "WiredTiger Change Log" echo "=====================" echo - cat ../NEWS) > ../src/docs/changelog.md + sed -e 's, \([0-9a-f]\{7\}\) , [\1](https://github.com/wiredtiger/wiredtiger/commit/\1) ,g' \ + -e 's,\(\(WT\|SERVER\)-[0-9]*\),[\1](https://jira.mongodb.org/browse/\1),g' ../NEWS) > ../src/docs/changelog.md } wtperf_config() diff --git a/dist/s_string b/dist/s_string index 08d066f5929..3a4f9e190d3 100755 --- a/dist/s_string +++ b/dist/s_string @@ -30,7 +30,8 @@ replace() { # check: # Check the spelling of an individual file. check() { - aspell --lang=en $1 list < ../$2 | + # Strip out git hashes, which are seven character hex strings. + sed 's/ [0-9a-f]\{7\} / /g' ../$2 | aspell --lang=en $1 list | sort -u | comm -23 /dev/stdin s_string.ok > $t test -s $t && { diff --git a/dist/s_string.ok b/dist/s_string.ok index 7de139f6a40..b408888970b 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -102,6 +102,7 @@ Encryptor Encryptors Enqueue Eron +FALLOC FALLTHROUGH FH FLD @@ -224,6 +225,7 @@ Obama Outfmt PARAM POSIX +PPC PREDEFINE PRIu PRNG @@ -358,6 +360,7 @@ arg argc args argv +asm async asyncopp asyncops @@ -594,6 +597,7 @@ free'd fscanf fstat fsync +fsyncLock fsyncs ftruncate func @@ -876,6 +880,7 @@ runtime rwlock sH sHQ +scalability sched scr sd |