Commit Graph

242 Commits

Author SHA1 Message Date
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
A.J. Beamon b7a46fe81c make_public.py doesn't need python to be invoked with the -B argument because we are no longer importing anything that would be affected by it. 2020-01-14 10:59:39 -08:00
Evan Tschannen c179176e5b update installer WIX GUID following release 2020-01-12 22:15:51 -08:00
John Brownlee 41fc724eaf
Merge pull request #2465 from PierreZ/samples/golang
Add a docker-compose go sample (#2404)
2020-01-03 13:53:09 -05: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
Alvin Moore 21390c493a Merge branch 'release-6.2' of github.com:apple/foundationdb into release_6.2_merge
Resolved merge by keeping new test file from master branch: SampleNoSimAttrition.txt adding new constraint from Release branch about existing test file: SimpleExternalTest.txt

# Conflicts:
#	tests/CMakeLists.txt
2019-12-18 09:05:08 -08:00
Alvin Moore 1d260a873c Set the Windows installer name to that of the make build 2019-12-17 09:39:13 -08:00
Pierre Zemb d9d2012994
Add a Golang sample using docker-compose 2019-12-14 16:03:12 +01:00
Pierre Zemb be2b97a0e9
Fix python sample using docker-compose 2019-12-14 15:25:33 +01: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 54a22646ac update installer WIX GUID following release 2019-11-22 15:28:36 -08:00
Evan Tschannen 3bd203b4f3 update installer WIX GUID following release 2019-11-22 11:02:54 -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 101bd5f5d8 update installer WIX GUID following release 2019-11-14 13:53:01 -08:00
Evan Tschannen 0681df52a3 update installer WIX GUID following release 2019-11-13 21:04:15 -08:00
Evan Tschannen e368ea9374 update installer WIX GUID following release 2019-11-13 21:02:04 -08:00
Evan Tschannen 9712be100a update installer WIX GUID following release 2019-11-12 23:19:32 -08:00