apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-17 03:12:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,037 Commits 35 Branches 318 Tags
Commit Graph

71 Commits

Author SHA1 Message Date
Balachandar Namasivayam
6d570cd865 Change version from 7.0 to 6.3 2020-04-03 21:38:58 -07:00
Evan Tschannen
e08f0201f1 merge release 6.2 into master 2020-03-17 12:51:47 -07:00
Evan Tschannen
303df197cf Merge branch 'release-6.2' 
# Conflicts:
#	CMakeLists.txt
#	bindings/c/test/mako/mako.c
#	documentation/sphinx/source/release-notes.rst
#	fdbbackup/backup.actor.cpp
#	fdbclient/NativeAPI.actor.cpp
#	fdbclient/NativeAPI.actor.h
#	fdbserver/DataDistributionQueue.actor.cpp
#	fdbserver/Knobs.cpp
#	fdbserver/Knobs.h
#	fdbserver/LogRouter.actor.cpp
#	fdbserver/SkipList.cpp
#	fdbserver/fdbserver.actor.cpp
#	flow/CMakeLists.txt
#	flow/Knobs.cpp
#	flow/Knobs.h
#	flow/flow.vcxproj
#	flow/flow.vcxproj.filters
#	versions.target
 2020-03-06 18:22:46 -08:00
Evan Tschannen
6054c05963 Merge branch 'release-6.2' 
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/fdbserver.actor.cpp
#	versions.target
 2020-02-28 12:11:05 -08:00
Evan Tschannen
924d335aa7 Merge branch 'release-6.2' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	flow/Knobs.cpp
#	flow/Knobs.h
 2020-02-25 18:25:19 -08:00
A.J. Beamon
9c9e643334 Fix some various indentation issues that caused weird formatting in the documentation output. 2020-02-21 20:05:48 -08: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
A.J. Beamon
450fd0910b Document role affinity changes that occurred in 6.0. 2020-02-21 15:47:16 -08:00
mpilman
752d95e81b updated old release notes 2020-02-10 17:27:11 -08:00
A.J. Beamon
adc72dde43 Merge branch 'release-6.2' into merge-release-6.2-into-master 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
 2020-01-28 12:16:24 -08:00
Evan Tschannen
6a26ca09b1 updated old release notes 2020-01-22 15:58:29 -08:00
A.J. Beamon
94dc152180 Add an API version upgrade guide that specifically documents what needs to change to client code when upgrading API versions. 2019-12-12 14:19:43 -08:00
Alvin Moore
3bf971ba8b Merge branch 'release-6.2' of github.com:apple/foundationdb into release_6.2_merge 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/storageserver.actor.cpp
 2019-12-12 07:13:12 -08:00
Evan Tschannen
3c769fcf60 Merge branch 'release-6.2' 
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/ClusterController.actor.cpp
#	fdbserver/MasterProxyServer.actor.cpp
#	versions.target
 2019-11-22 15:39:19 -08:00
Evan Tschannen
8d3ef89540 Merge branch 'release-6.2' 
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/release-notes.rst
#	fdbclient/MutationList.h
#	fdbserver/MasterProxyServer.actor.cpp
#	versions.target
 2019-11-14 15:49:56 -08:00
Evan Tschannen
afc9713005 Merge branch 'release-6.2' 
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/release-notes.rst
#	fdbclient/FDBTypes.h
#	fdbserver/LogSystem.h
#	fdbserver/LogSystemPeekCursor.actor.cpp
#	fdbserver/OldTLogServer_6_0.actor.cpp
#	fdbserver/TLogServer.actor.cpp
#	versions.target
 2019-11-06 13:45:37 -08:00
Evan Tschannen
4de60fc437 Merge branch 'release-6.2' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/TLogServer.actor.cpp
 2019-11-01 15:48:04 -07:00
Evan Tschannen
3325980c03 Merge branch 'release-6.2' 
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/DataDistribution.actor.cpp
#	fdbserver/OldTLogServer_6_0.actor.cpp
#	fdbserver/TLogServer.actor.cpp
#	fdbserver/WorkerInterface.actor.h
#	fdbserver/worker.actor.cpp
#	versions.target
 2019-10-24 17:38:15 -07:00
Evan Tschannen
688940b685 merge 6.2 into master 2019-10-21 11:43:46 -07:00
Meng Xu
d0147e5e5d Merge branch 'release-6.2' into mengxu/merge-release620-to-master-v3 
Resolved Conflicts:
	documentation/sphinx/source/release-notes.rst
	fdbserver/DataDistribution.actor.cpp
	versions.target
 2019-10-02 13:22:56 -07:00
A.J. Beamon
0bf7fdb450 Merge branch 'release-6.1' into merge-release-6.1-into-release-6.2 
# Conflicts:
#	bindings/c/fdb_c.cpp
#	documentation/sphinx/source/release-notes.rst
 2019-09-30 13:37:46 -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
24aad14f06 Merge branch 'release-6.2' 
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/release-notes.rst
#	versions.target
 2019-08-30 17:23:58 -07:00
Evan Tschannen
863a7ea84c Merge branch 'release-6.2' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	versions.target
 2019-08-13 18:33:52 -07:00
Evan Tschannen
13ff1d78d4 Merge branch 'release-6.2' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	versions.target
 2019-08-09 20:33:19 -07:00
Evan Tschannen
b8a8f3bd13 updated master for the next release 2019-08-07 19:21:44 -07:00
A.J. Beamon
b5d2234a13 Merge branch 'release-6.1' into merge-release-6.1-into-master 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbbackup/backup.actor.cpp
#	fdbserver/MoveKeys.actor.cpp
#	flow/FastAlloc.h
#	versions.target
 2019-07-30 16:23:42 -07:00
Evan Tschannen
b146da0dd1 Merge branch 'release-6.1' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/DataDistribution.actor.cpp
#	versions.target
 2019-07-07 20:54:59 -07:00
A.J. Beamon
5da906d067 Fix underline length 2019-06-14 15:14:48 -07:00
Evan Tschannen
20e3edeb0a Merge branch 'release-6.1' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/storageserver.actor.cpp
#	versions.target
 2019-06-14 12:42:59 -07:00
A.J. Beamon
d29c7e4c9b Merge branch 'release-6.1' into merge-release-6.1-into-master 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/QuietDatabase.actor.cpp
#	versions.target
 2019-05-23 09:28:45 -07:00
A.J. Beamon
87e1860d7c A bunch of documentation fixes 2019-05-21 16:30:52 -07:00
Evan Tschannen
f4fbaac6b0 Merge branch 'release-6.1' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	versions.target
 2019-05-19 10:27:59 -07:00
Evan Tschannen
8c3516951a Merge branch 'release-6.1' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	versions.target
 2019-05-12 20:13:49 -07:00
Evan Tschannen
22499666d0 Merge branch 'release-6.1' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/LogRouter.actor.cpp
#	flow/Trace.cpp
#	versions.target
 2019-05-08 18:19:35 -07:00
Evan Tschannen
2d5043c665 Merge branch 'release-6.1' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	versions.target
 2019-04-30 18:27:04 -07:00
Alvin Moore
20b995d244 Updated old release 6.1 release notes 2019-04-23 10:17:08 -07:00
Alvin Moore
2bea99591e Merge branch 'release-6.1' of copy of master 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
 2019-04-17 15:51:48 -07:00
Evan Tschannen
44c3072629 updated versions.target and release notes 2019-04-02 22:36:55 -07:00
Evan Tschannen
684a22a52b Merge branch 'release-6.0' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbbackup/backup.actor.cpp
#	fdbclient/BackupContainer.actor.cpp
#	fdbclient/HTTP.actor.cpp
#	fdbserver/storageserver.actor.cpp
#	fdbserver/workloads/BackupCorrectness.actor.cpp
#	versions.target
 2019-01-09 16:14:46 -08:00
Evan Tschannen
d2d68aa171 Merge branch 'release-6.0' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbclient/ManagementAPI.actor.cpp
#	versions.target
 2018-12-03 18:26:52 -08:00
Evan Tschannen
1f3b6e8bdf Merge branch 'release-6.0' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbclient/BackupContainer.actor.cpp
#	fdbclient/BlobStore.actor.cpp
#	versions.target
 2018-11-27 14:41:46 -08:00
A.J. Beamon
975711c389 Merge branch 'release-6.0' of github.com:apple/foundationdb 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
 2018-11-27 09:50:39 -08:00
Evan Tschannen
e45952bc53 Merge branch 'release-6.0' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbclient/BackupContainer.actor.cpp
#	fdbclient/BlobStore.actor.cpp
#	fdbclient/HTTP.actor.cpp
#	tests/BlobStore.txt
#	versions.target
 2018-11-13 16:06:39 -08:00
Evan Tschannen
4b5d0b4e2c Merge branch 'release-6.0' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	fdbclient/AsyncFileBlobStore.actor.cpp
#	fdbclient/AsyncFileBlobStore.actor.h
#	fdbclient/BlobStore.actor.cpp
#	fdbclient/BlobStore.h
#	fdbclient/HTTP.actor.cpp
#	fdbclient/ManagementAPI.actor.cpp
#	fdbclient/NativeAPI.actor.cpp
#	fdbrpc/LoadBalance.actor.h
#	fdbrpc/batcher.actor.h
#	fdbrpc/fdbrpc.vcxproj
#	fdbrpc/sim2.actor.cpp
#	fdbserver/DataDistribution.actor.cpp
#	fdbserver/DataDistributionTracker.actor.cpp
#	fdbserver/SimulatedCluster.actor.cpp
#	fdbserver/TLogServer.actor.cpp
#	fdbserver/masterserver.actor.cpp
 2018-11-10 13:04:24 -08:00
A.J. Beamon
d54af96ba4 Various fixes to our documentation, such as syntax problems, broken links, etc. 2018-11-01 14:19:37 -07:00
Evan Tschannen
24c5a8982c Merge branch 'release-6.0' 
# Conflicts:
#	documentation/sphinx/source/release-notes.rst
#	versions.target
 2018-10-24 15:40:37 -07:00
A.J. Beamon
a72c8f5cb2
Merge pull request #811 from apple/release-6.0 
Merge release-6.0 into master
 2018-10-04 13:30:49 -07:00
A.J. Beamon
d02b6bf211
Merge pull request #810 from apple/release-5.2 
Merge release-5.2 into release-6.0
 2018-10-04 13:30:26 -07:00
A.J. Beamon
b3912b3918
Merge pull request #809 from apple/release-5.1 
Merge release-5.1 into release-5.2
 2018-10-04 13:29:58 -07:00