94 Commits

Author SHA1 Message Date
Andrew Noyes
b0f61fb74f Resolve the simple-looking conflicts 2021-01-15 19:35:10 +00:00
Andrew Noyes
ff7d306b09 Merge branch 'release-6.3' into anoyes/merge-6.3-to-master
Include conflict markers for now. Will resolve.
2021-01-15 18:04:09 +00:00
Balachandar Namasivayam
74c6427e6e update version to 6.3.11 2021-01-06 23:29:57 -08:00
sfc-gh-tclinkenbeard
7ddbd1847d Exclude flowbench target from all 2020-10-10 15:03:53 -07:00
Meng Xu
50a7398e75 update version to 6.3.10 2020-10-07 20:26:00 -07:00
Evan Tschannen
164fce6bdb update version to 6.3.9 2020-09-30 22:46:05 -07:00
Evan Tschannen
6a51a35d81 update version to 6.3.8 2020-09-24 23:02:57 -07:00
Evan Tschannen
0f7b8fa613 update version to 6.3.7 2020-09-24 16:53:53 -07:00
Evan Tschannen
624b2e1489 update version to 6.3.6 2020-08-31 18:14:19 -07:00
sfc-gh-tclinkenbeard
273d34be1a Renamed fdbbench to flowbench 2020-08-03 15:45:47 -07:00
Evan Tschannen
7cdf0b5c31 update version to 6.3.5 2020-07-28 23:17:10 -07:00
sfc-gh-tclinkenbeard
525e51a756 Build benchmark library as external project 2020-07-26 12:09:11 -07:00
sfc-gh-tclinkenbeard
888bae40d0 Initial commit for performance directory
Includes BenchPopulate benchmarks to benchmark the population of a
VectorRef<MutationRef>.
2020-07-26 12:09:11 -07:00
Evan Tschannen
cb651df915 update version to 6.3.4 2020-07-14 14:50:11 -07:00
Evan Tschannen
fdc14d9c57 update version to 6.3.3 2020-06-15 11:06:39 -07:00
Evan Tschannen
11989c0650 update version to 6.3.2 2020-06-05 11:10:09 -07:00
Evan Tschannen
9c78a2f320 update version to 6.3.1 2020-05-27 14:36:10 -07:00
Evan Tschannen
19a9ae14c2 update master version to 7.0.0 2020-05-10 23:51:15 -07:00
Dave Cottlehuber
28e58c672a fdbmonitor: ifdef config path location 2020-04-30 20:11:43 +00:00
Dave Cottlehuber
98a6979f5b update link options in CMakeLists 2020-04-30 18:11:23 +00:00
Markus Pilman
b616a6b3b6 generate versions.target with cmake 2020-04-07 11:33:47 -07:00
Markus Pilman
b93d8e8b21 fix cmake dependency to version.target 2020-04-07 11:09:11 -07:00
Balachandar Namasivayam
e58bd172b7 Change fdb version in cmake to 6.3.0 2020-04-03 21:53:55 -07:00
Markus Pilman
ac9f79116e Build bindingtester 2020-03-26 16:01:58 -07:00
mpilman
ce6c4cb8d8 Build and package TestHarness 2020-03-25 17:36:47 -07:00
Evan Tschannen
96258b9809 Merge branch 'release-6.2'
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbcli/fdbcli.actor.cpp
#	fdbclient/ManagementAPI.actor.cpp
#	fdbrpc/FlowTransport.actor.cpp
#	fdbserver/ClusterController.actor.cpp
#	fdbserver/DataDistribution.actor.cpp
#	fdbserver/DataDistribution.actor.h
#	fdbserver/DataDistributionQueue.actor.cpp
#	fdbserver/KeyValueStoreMemory.actor.cpp
#	fdbserver/MasterProxyServer.actor.cpp
#	fdbserver/QuietDatabase.actor.cpp
#	fdbserver/SkipList.cpp
#	fdbserver/StorageMetrics.actor.h
#	fdbserver/TLogServer.actor.cpp
#	fdbserver/fdbserver.actor.cpp
#	fdbserver/storageserver.actor.cpp
#	fdbserver/workloads/KVStoreTest.actor.cpp
#	flow/CMakeLists.txt
#	flow/Knobs.cpp
#	flow/Knobs.h
#	flow/genericactors.actor.cpp
#	flow/serialize.h
2020-02-21 19:09:16 -08:00
Evan Tschannen
f04e311a1e Merge commit 'b46d6e25e24993ab5a5f04091fd3235050b7cd09' into feature-boost-ssl
# Conflicts:
#	fdbserver/SimulatedCluster.actor.cpp
#	flow/Net2.actor.cpp
2020-02-20 17:36:38 -08:00
mpilman
5a9d420cb7 Merge remote-tracking branch 'upstream/release-6.2' into release-merges/20200210 2020-02-10 10:02:05 -08:00
mpilman
0a7116444f Make compile commands target work on Windows 2020-02-09 08:34:52 -08:00
mpilman
5c294e2646 Several build improvements - enables parallel builds on Windows (again) 2020-02-09 08:34:14 -08:00
Alex Miller
2a2bf945ef Also remove FDBLibTLS from CMake 2020-02-06 21:55:13 -08:00
Evan Tschannen
7924df1d5d update version to 6.2.16 2020-01-21 21:33:56 -08:00
Evan Tschannen
7bb734632e update version to 6.2.15 2020-01-20 18:50:20 -08:00
Evan Tschannen
99ded328f0 update version to 6.2.14 2020-01-15 23:02:18 -08:00
Evan Tschannen
f1c6d4d142 update version to 6.2.13 2020-01-14 11:28:44 -08:00
Alvin Moore
06e7bc061d
Merge pull request #2500 from apple/release-6.2
Merge Release 6.2 Into Master
2019-12-23 15:00:34 -08:00
Alvin Moore
6acf04bb72 Ensured that the cmake variable is always initialized/set to some value when compared and thereby has an expected value 2019-12-23 11:50:01 -08:00
Evan Tschannen
74500161f4 update CMake version 2019-11-22 15:30:10 -08:00
Evan Tschannen
afe40813b0 updated cmake version 2019-11-14 13:54:12 -08:00
Evan Tschannen
5b2cdb977c update cmake version 2019-11-13 21:03:10 -08:00
Evan Tschannen
86abb0d467 updated cmake for 6.2.9 2019-11-06 13:12:30 -08:00
Balachandar Namasivayam
cecef8d0b5 Added contrib folder to foundationdb. New tool called transaction_profiling_analyzer has been added to the folder. It is a python script that parses transaction profiling info and analyzes hot keys and ranges. Also monitoring folder has been moved to the contrib folder. 2019-11-04 16:31:20 -08:00
Andrew Noyes
ec0789f2e7 Build in Debug mode by default for OPEN_FOR_IDE build 2019-10-25 10:41:42 -07:00
Evan Tschannen
fdb0bcdfbc update cmake to 6.2.8 2019-10-24 17:05:45 -07:00
mpilman
2d0722b0c7 fixed cmake version 2019-10-21 11:22:05 -07:00
Alvin Moore
7457206748 Fixed CMake version to match versions.target 2019-10-03 01:10:47 -07:00
Evan Tschannen
b495cc697b Merge branch 'release-6.2'
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/release-notes.rst
#	versions.target
2019-09-13 09:25:08 -07:00
Evan Tschannen
0a2947584c
Update CMakeLists.txt 2019-09-13 09:11:12 -07:00
mpilman
05ffe98e91 Assert that version in versions.target and cmake are in sync 2019-09-05 13:54:58 -07:00
Andrew Noyes
37ca38a013 Update cmake version to 7.0.0 2019-08-20 15:55:20 -07:00