Evan Tschannen
|
4bdcd8fc12
|
Merge branch 'release-4.6' into release-5.0
# Conflicts:
# bindings/bindingtester/run_binding_tester.sh
# fdbrpc/AsyncFileKAIO.actor.h
|
2017-06-14 16:43:53 -07:00 |
|
Stephen Atherton
|
b65ad3563c
|
Merge branch 'master' into feature-redwood
# Conflicts:
# fdbserver/fdbserver.vcxproj
# fdbserver/fdbserver.vcxproj.filters
|
2017-06-09 14:56:41 -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 |
|
A.J. Beamon
|
fc468f682b
|
Merge branch 'release-5.0' into bindings-tuple-improvements
# Conflicts:
# bindings/java/src-completable/main/com/apple/apple/foundationdbdb/tuple/Tuple.java
|
2017-05-26 12:33:33 -07:00 |
|
FDB Dev Team
|
a674cb4ef4
|
Initial repository commit
|
2017-05-25 13:48:44 -07:00 |