Commit Graph

274 Commits

Author SHA1 Message Date
Alec Grieser 7a1133fbf2
Merge pull request #4487 from johscheuer/docker-add-support-multiple-hostnames
Use only one IP address that matches the hostname
2021-04-13 15:12:38 -07:00
falsandtru 85d3e2fee5
Update example Dockerfile (#4488) 2021-03-18 11:54:03 -05:00
A.J. Beamon 25c4880ebe Merge branch 'release-6.3' into merge-release-6.3-into-master (temporarily discard all changes to BackupContainer.actor.cpp)
# Conflicts:
#	fdbclient/BackupContainer.actor.cpp
#	fdbserver/Knobs.h
2021-03-15 16:41:04 -07:00
Johannes Scheuermann f9d6594d44
Add tini as PID 1 to docker image (#4363) 2021-03-15 08:47:34 -05:00
Johannes M. Scheuermann 5259721a58 Use only one IP address that matches the hostname 2021-03-14 19:46:12 +00:00
Vishesh Yadav 2cd3f45fd6 Merge remote-tracking branch 'apple/release-6.3' into master-format-final
release-6.3 was recently merged, and there were two PRs which were
merged in between and got those changes in here. Hence, since all the
changes were in, discarded the incoming changes and accepted all
current.
2021-03-10 16:50:44 -08:00
Markus Pilman 1510c97085 fix debian packages 2021-03-02 12:41:21 -07:00
Johannes M. Scheuermann 2aff6f162b Fix docker image 2021-02-19 07:33:55 +00:00
A.J. Beamon e05cc598e8
Merge pull request #4298 from sfc-gh-ajbeamon/merge-release-6.3-into-master
Merge release 6.3 into master
2021-02-08 17:13:32 -08:00
Russell Sears 1d3e9de82a
Merge pull request #4171 from paulvollmer/fix-sample-golang
Fix sample golang
2021-02-08 13:02:48 -08:00
A.J. Beamon aaf0a9aa7b Merge branch 'release-6.3' into merge-release-6.3-into-master
# Conflicts:
#	build/docker-compose.yaml
#	cmake/ConfigureCompiler.cmake
#	fdbclient/FileBackupAgent.actor.cpp
#	fdbrpc/AsyncFileCached.actor.h
#	fdbrpc/IAsyncFile.h
#	fdbrpc/IRateControl.h
#	fdbrpc/simulator.h
#	fdbserver/KeyValueStoreSQLite.actor.cpp
#	fdbserver/storageserver.actor.cpp
#	fdbservice/ServiceBase.cpp
2021-02-08 12:58:34 -08:00
Markus Pilman b0f8784bf1
Merge pull request #4247 from apkar/release-6.3
Adding debug tools to FDB runtime image
2021-02-02 08:39:39 -07:00
Bhaskar Muppana a207fff82e Adding debug tools to FDB runtime image 2021-01-28 18:28:08 -08:00
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
Paul Vollmer 53762a19d4 chore: sample golang dockerfile and readme update
- variable for the foundationdb website url to the golang sample Dockerfile (similar to the python sample Dockerfile)
- added sample command to access cluster
2020-12-16 21:03:24 +01:00
Paul Vollmer 3bd96e8b07 chore: update fdb version at golang sample .env 2020-12-16 20:59:48 +01: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