diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2016-01-01 16:14:23 -0500 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2016-01-01 16:14:23 -0500 |
| commit | da9b67d933e5ad13829ba21d3eada5a7188cb7c7 (patch) | |
| tree | e8a5657b24ec2f5954b7a937ec30b09e9590570f /dist | |
| parent | 67f76e0a711fedc290cb7f5d4319a5fb1a87e831 (diff) | |
| parent | f1a56169ba8d6bcaefac26d05aa08d7b170e8b89 (diff) | |
| download | mongo-da9b67d933e5ad13829ba21d3eada5a7188cb7c7.tar.gz | |
Merge branch 'develop' into wt-2287-rebalance
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/filelist | 1 | ||||
| -rw-r--r-- | dist/s_string.ok | 11 | ||||
| -rwxr-xr-x | dist/s_win | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/dist/filelist b/dist/filelist index 830e58fcc25..edd59435841 100644 --- a/dist/filelist +++ b/dist/filelist @@ -120,6 +120,7 @@ src/os_posix/os_mtx_cond.c src/os_posix/os_mtx_rw.c src/os_posix/os_once.c src/os_posix/os_open.c +src/os_posix/os_pagesize.c src/os_posix/os_path.c src/os_posix/os_priv.c src/os_posix/os_remove.c diff --git a/dist/s_string.ok b/dist/s_string.ok index 352fcb1a4ad..476947e94e3 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -181,6 +181,7 @@ LevelDB Levyx Llqr Llqrt +LoadLoad LockFile Lookaside Lookup @@ -286,10 +287,13 @@ Spinlock Spinlocks Split's Stoica +StoreLoad +StoreStore TAILQ TCMalloc TODO TORTIOUS +TSO TXN TXNC Timespec @@ -304,6 +308,7 @@ ULINE URI URIs UTF +UltraSparc Unbuffered UnixLib Unmap @@ -374,6 +379,7 @@ automake bInheritHandle basecfg basho +bcr bdb beginthreadex bigram @@ -415,6 +421,7 @@ bzip calloc cas catfmt +ccr cd centric cfg @@ -426,6 +433,7 @@ checkpointer checkpointing checksum checksums +children's chk chongo cip @@ -714,6 +722,7 @@ lookaside lookup lookups lossy +lr lrt lru lseek @@ -808,6 +817,7 @@ os ovfl ownp packv +pagesize parens pareto parserp @@ -1029,6 +1039,7 @@ variable's vectorized versa vfprintf +vm vpack vprintf vrfy diff --git a/dist/s_win b/dist/s_win index cdfc71a8a1e..1eb4702d517 100755 --- a/dist/s_win +++ b/dist/s_win @@ -62,6 +62,7 @@ win_filelist() -e 's;os_posix/os_mtx_cond.c;os_win/os_mtx_cond.c;' \ -e 's;os_posix/os_once.c;os_win/os_once.c;' \ -e 's;os_posix/os_open.c;os_win/os_open.c;' \ + -e 's;os_posix/os_pagesize.c;os_win/os_pagesize.c;' \ -e 's;os_posix/os_path.c;os_win/os_path.c;' \ -e 's;os_posix/os_priv.c;os_win/os_priv.c;' \ -e 's;os_posix/os_remove.c;os_win/os_remove.c;' \ |