Commit Graph

19 Commits

Author SHA1 Message Date
Evan Tschannen 6ea9903c82 Merge branch 'release-5.0'
# Conflicts:
#	fdbbackup/backup.actor.cpp
#	fdbserver/ClusterController.actor.cpp
#	versions.target
2017-10-01 18:46:44 -07:00
Evan Tschannen 1a73e31959 updated wix guid 2017-10-01 18:37:22 -07:00
Evan Tschannen 5f82bfe533 updated release notes for 5.0.5 2017-10-01 17:45:56 -07:00
Yichi Chiang d9bc7edda0 Merge from release-5.0.4 2017-08-29 15:04:28 -07:00
Yichi Chiang 512f02bb8e Update GUID for release-5.0.4 2017-08-29 10:12:00 -07:00
A.J. Beamon 9a0a3b6329 Merge commit '66528becb82d826e81fa644bb378212584ab580e' 2017-08-28 16:47:59 -07:00
Yichi Chiang 6b2f1abbf8 release 5.0.4 preparation 2017-08-28 16:02:31 -07:00
John Brownlee 448fccbdaf Merge pull request #140 from cie/remove-wd40-refs
Remove wd40 refs
2017-08-14 10:22:52 -07:00
Stephen Atherton 4b8e2adb8e Updated WIX Installer GUID. 2017-08-09 23:24:05 -07:00
Stephen Atherton 95cd5dc3a2 Updated installer package GUID, updated docs for 5.0.3. 2017-08-09 22:29:02 -07:00
Evan Tschannen 6bc87b5837 updated wix guid 2017-07-27 16:39:46 -07:00
Evan Tschannen 7e69a09e0e updated release notes, updated WIX guid 2017-07-27 14:40:49 -07:00
John King 2710ab28ea removed delete_wd40_env option from sample conffile 2017-07-21 13:22:23 -07:00
Balachandar Namasivayam 529e7a191c Generate new guid for FDBInstaller.wxs 2017-06-28 18:43:22 -07:00
Alvin Moore 909e15ed44 Generated new Windows GUID after release 5.0 2017-06-26 18:05:31 -07:00
Alvin Moore 8f7c76ddd3 Merge branch 'release-4.6' into release-5.0
# Conflicts:
#	fdbserver/Knobs.h
Updated Windows GUID
Updated and corrected format of Protocol Version
2017-06-26 15:54:57 -07:00
Alec Grieser 1cce243840 Merge branch 'release-4.6' into release-5.0 2017-06-19 17:50:52 -07:00
Stephen Atherton f405c8d88e Merge branch 'release-4.6' into release-5.0
# Conflicts:
#	fdbrpc/AsyncFileKAIO.actor.h
#	fdbrpc/sim2.actor.cpp
#	fdbserver/optimisttest.actor.cpp
#	versions.target
2017-06-15 17:40:19 -07:00
FDB Dev Team a674cb4ef4 Initial repository commit 2017-05-25 13:48:44 -07:00