From 8f7c76ddd31e908b5b3ed4a380745497b49cd424 Mon Sep 17 00:00:00 2001
From: Alvin Moore <alvinm@apple.com>
Date: Mon, 26 Jun 2017 15:54:57 -0700
Subject: [PATCH] Merge branch 'release-4.6' into release-5.0

# Conflicts:
#	fdbserver/Knobs.h
Updated Windows GUID
Updated and corrected format of Protocol Version
---
 flow/Net2.actor.cpp            | 8 ++++----
 packaging/msi/FDBInstaller.wxs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index a19b49c59c6..28c9a74e43c 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -52,7 +52,7 @@ using namespace boost::asio::ip;
 // These impact both communications and the deserialization of certain zookeeper, database and IKeyValueStore keys
 //                                                 xyzdev
 //                                                 vvvv
-uint64_t currentProtocolVersion        = 0x0FDB00A470010001LL;
+uint64_t currentProtocolVersion        = 0x0FDB00A550010001LL;
 uint64_t compatibleProtocolVersionMask = 0xffffffffffff0000LL;
 uint64_t minValidProtocolVersion       = 0x0FDB00A200060001LL;
 
@@ -550,7 +550,7 @@ void Net2::run() {
 
 	timeOffsetLogger = logTimeOffset();
 	startProfiling(this);
-	
+
 	// Get the address to the launch function
 	typedef void (*runCycleFuncPtr)();
 	runCycleFuncPtr runFunc = reinterpret_cast<runCycleFuncPtr>(reinterpret_cast<flowGlobalType>(g_network->global(INetwork::enRunCycleFunc)));
@@ -606,7 +606,7 @@ void Net2::run() {
 		taskBegin = timer_monotonic();
 		numYields = 0;
 		int minTaskID = TaskMaxPriority;
-		
+
 		while (!ready.empty()) {
 			++countTasks;
 			currentTaskID = ready.top().taskID;
@@ -671,7 +671,7 @@ void Net2::run() {
 		}
 #endif
 
-		if ((nnow-now) > FLOW_KNOBS->SLOW_LOOP_CUTOFF && g_nondeterministic_random->random01() < (nnow-now)*FLOW_KNOBS->SLOW_LOOP_SAMPLING_RATE) 
+		if ((nnow-now) > FLOW_KNOBS->SLOW_LOOP_CUTOFF && g_nondeterministic_random->random01() < (nnow-now)*FLOW_KNOBS->SLOW_LOOP_SAMPLING_RATE)
 			TraceEvent("SomewhatSlowRunLoopBottom").detail("Elapsed", nnow - now); // This includes the time spent running tasks
 
 		trackMinPriority( minTaskID, nnow );
diff --git a/packaging/msi/FDBInstaller.wxs b/packaging/msi/FDBInstaller.wxs
index ea4de9f35a0..1fc0160c77c 100644
--- a/packaging/msi/FDBInstaller.wxs
+++ b/packaging/msi/FDBInstaller.wxs
@@ -32,7 +32,7 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Name='$(var.Title)'
-           Id='{E93B02C4-7D41-458E-9117-1C6FCF6F4D41}'
+           Id='{72149D28-1667-4B15-9E1F-74AEB98EC63D}'
            UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
            Version='$(var.Version)'
            Manufacturer='$(var.Manufacturer)'