Commit Graph

259 Commits

Author SHA1 Message Date
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 73233d778d update installer WIX GUID following release 2021-01-06 23:29:57 -08:00
David Youngworth d64cf8b9e3 Merge branch 6.3 into master 2020-11-17 11:22:45 -08:00
Markus Pilman 703b2e276a addressed review comments 2020-11-05 15:50:24 -07:00
Markus Pilman f763d89dc3 add alternatives to install symlinks 2020-10-28 14:03:48 -06:00
Markus Pilman ca57738df2 remove support for el6 2020-10-28 13:10:59 -06:00
A.J. Beamon 0795bcbcf2
Merge pull request #3857 from johscheuer/update-python-sample-app
Update Python Docker sample app
2020-10-21 11:02:10 -07:00
Young Liu 8cc3e4d3c6 Merge release-6.3 into master 2020-10-19 22:51:56 -07:00
A.J. Beamon 0e0ef6c773
Merge pull request #3841 from oleg68/osamarin14
Unable to restart foundationdb after fdbmonitor has died #3838
2020-10-14 13:17:51 -07:00
Johannes M. Scheuermann 003ab13da2 Update Python Docker sample app 2020-10-08 15:29:27 +02:00
Oleg Samarin 91f9c7a3fe Changed defaults for RestartSec 2020-10-08 13:18:19 +03:00
Meng Xu e9825c5b4a update installer WIX GUID following release 2020-10-07 20:26:00 -07:00
Oleg Samarin da96ae7c1e Unable to restart foundationdb after fdbmonitor has died #3838 2020-10-02 15:07:47 +03:00
Evan Tschannen 43c64288e1 update installer WIX GUID following release 2020-09-30 22:46:05 -07:00
Evan Tschannen cd79b50dd8 update installer WIX GUID following release 2020-09-24 23:02:57 -07:00
Evan Tschannen 2f0bf65b11 update installer WIX GUID following release 2020-09-24 16:53:53 -07:00
Evan Tschannen 8e94e0313d update installer WIX GUID following release 2020-08-31 18:14:19 -07:00
Evan Tschannen 0c8bec5e43 update installer WIX GUID following release 2020-07-28 23:17:10 -07:00
Evan Tschannen 40c46ae59b update installer WIX GUID following release 2020-07-14 14:50:11 -07:00
Evan Tschannen b788fb1e60 update installer WIX GUID following release 2020-06-15 11:06:39 -07:00
Evan Tschannen 3508a0f06a update installer WIX GUID following release 2020-06-05 11:10:09 -07:00
Evan Tschannen 262b8eb175 update installer WIX GUID following release 2020-05-27 14:36:10 -07:00
Evan Tschannen 5738a4d70b update installer WIX GUID following release 2020-05-22 11:08:40 -07:00
Sergey Sudakovich 3814b412fe Allow custom fdb.cluster file content 2020-05-01 15:42:16 -07:00
Evan Tschannen c87aa33941 Merge branch 'release-6.2'
# Conflicts:
#	CMakeLists.txt
#	bindings/go/src/fdb/generated.go
#	documentation/sphinx/source/api-common.rst.inc
#	documentation/sphinx/source/api-ruby.rst
#	documentation/sphinx/source/release-notes.rst
#	fdbclient/FailureMonitorClient.actor.cpp
#	fdbclient/NativeAPI.actor.cpp
#	fdbclient/vexillographer/fdb.options
#	fdbrpc/FlowTransport.actor.cpp
#	fdbserver/OldTLogServer_6_0.actor.cpp
#	fdbserver/TLogServer.actor.cpp
#	fdbserver/fdbserver.actor.cpp
#	versions.target
2020-04-23 13:47:53 -07:00
Evan Tschannen 44cf59ca81 update installer WIX GUID following release 2020-04-23 13:16:46 -07:00
Evan Tschannen e08f0201f1 merge release 6.2 into master 2020-03-17 12:51:47 -07:00
Evan Tschannen 29f16630f5 update installer WIX GUID following release 2020-03-17 11:47:51 -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 f2cb743cfa update installer WIX GUID following release 2020-03-06 13:58:03 -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 e113b84e25 update installer WIX GUID following release 2020-02-26 22:24:48 -08:00
Evan Tschannen 6864aaa5b0 Merge branch 'release-6.2'
# Conflicts:
#	CMakeLists.txt
#	versions.target
2020-02-25 20:59:19 -08:00
Evan Tschannen 30e628e79a update installer WIX GUID following release 2020-02-25 20:50:48 -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
Evan Tschannen 26d6e07990 update installer WIX GUID following release 2020-02-25 17:21:59 -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
Alex Miller 6bacd11ab5 Don't require /usr/bin/python in RPMs.
This was being "helpfully" automatically added for us by rpmbuild as it
saw that we listed a python file (make_public.py) in %files.  As that
isn't a vital thing for running FDB, it's better to not make it a hard
requirement.
2020-02-20 02:10:25 -08:00
osamarin 0931378869 #2691 start foundationdb only after the public ip adress exists 2020-02-20 12:01:32 +03:00
John Brownlee eba2b4528e Use an older FDB library in the python sample app to support testing upgrades from 6.1 to 6.2. 2020-02-01 17:51:54 -08:00
John Brownlee 52ee2ec815 Add additional client libraries to the sample python app to show how to prepare for upgrades.
Skip the creating of the cluster file in the sample python app if it exists and is non-empty.
Document that we have published the sample python app image.
2020-01-29 12:05:37 -08:00
Evan Tschannen 78adbea834 Merge branch 'release-6.2'
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/release-notes.rst
#	flow/Knobs.h
#	versions.target
2020-01-21 21:38:19 -08:00
Evan Tschannen 96837bed71 update installer WIX GUID following release 2020-01-21 21:33:56 -08:00
Evan Tschannen be4429afe0 update installer WIX GUID following release 2020-01-21 19:09:45 -08:00
Evan Tschannen ba140b1029 Merge branch 'release-6.2'
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/release-notes.rst
#	versions.target
2020-01-20 18:52:28 -08:00
Evan Tschannen 07ddaed6f1 update installer WIX GUID following release 2020-01-20 18:50:20 -08:00
Evan Tschannen d9efe30b74 update installer WIX GUID following release 2020-01-20 14:34:13 -08:00
Evan Tschannen 3f9d9d8b84 Merge branch 'release-6.2'
# Conflicts:
#	CMakeLists.txt
#	cmake/FlowCommands.cmake
#	documentation/sphinx/source/release-notes.rst
#	fdbclient/StorageServerInterface.h
#	fdbserver/DataDistributionTracker.actor.cpp
#	fdbserver/MasterProxyServer.actor.cpp
#	fdbserver/fdbserver.actor.cpp
#	flow/Knobs.h
#	flow/Platform.cpp
#	versions.target
2020-01-16 18:37:47 -08:00
Evan Tschannen 11ff7903d4 update installer WIX GUID following release 2020-01-15 23:02:18 -08:00
Evan Tschannen 2b514a9573 update installer WIX GUID following release 2020-01-14 11:28:44 -08:00