Evan Tschannen
|
dc1f7ca6b7
|
testers now use client locality load balancing
|
2017-09-01 12:53:01 -07:00 |
|
Stephen Atherton
|
f405c8d88e
|
Merge branch 'release-4.6' into release-5.0
# Conflicts:
# fdbrpc/AsyncFileKAIO.actor.h
# fdbrpc/sim2.actor.cpp
# fdbserver/optimisttest.actor.cpp
# versions.target
|
2017-06-15 17:40:19 -07:00 |
|
Stephen Atherton
|
5de6c703cf
|
Fixed line endings which were changed to UNIX style during a recent merge.
|
2017-06-15 16:57:35 -07:00 |
|
Evan Tschannen
|
bfcbb5623f
|
fixed build from merge error
|
2017-06-01 12:07:30 -07:00 |
|
Stephen Atherton
|
fa4fdb1f1d
|
Merge branch 'fix-io-timeout-handling' into release-5.0
# Conflicts:
# fdbserver/optimisttest.actor.cpp
|
2017-05-31 17:03:15 -07:00 |
|
Stephen Atherton
|
98604d33a0
|
Merge branch 'fix-io-timeout-handling'
# Conflicts:
# fdbrpc/AsyncFileKAIO.actor.h
# fdbrpc/sim2.actor.cpp
# fdbserver/KeyValueStoreSQLite.actor.cpp
# fdbserver/optimisttest.actor.cpp
# fdbserver/worker.actor.cpp
# fdbserver/workloads/MachineAttrition.actor.cpp
# tests/fast/SidebandWithStatus.txt
# tests/rare/LargeApiCorrectnessStatus.txt
# tests/slow/DDBalanceAndRemoveStatus.txt
|
2017-05-26 18:43:08 -07:00 |
|
FDB Dev Team
|
a674cb4ef4
|
Initial repository commit
|
2017-05-25 13:48:44 -07:00 |