From ceec580d2f5f6ec7f24e037d63d7793155c890bc Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <ajbeamon@apple.com>
Date: Fri, 16 Feb 2018 10:09:03 -0800
Subject: [PATCH 1/5] fdbcli considered a backup running if the
 'running_backup' field was present, not if it was true.

---
 fdbcli/fdbcli.actor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index e0878784cb..91b803f3ca 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -624,7 +624,8 @@ void getBackupDRTags(StatusObjectReader &statusObjCluster, const char *context,
 		for(auto itr : tags.obj()) {
 			JSONDoc tag(itr.second);
 			bool running = false;
-			if(tag.tryGet("running_backup", running)) {
+			tag.tryGet("running_backup", running);
+			if(running) {
 				std::string uid;
 				if(tag.tryGet("mutation_stream_id", uid)) {
 					tagMap[itr.first] = uid;

From 8c53483838da5537daaa5f86597a9271b50a213c Mon Sep 17 00:00:00 2001
From: Evan Tschannen <ejt@apple.com>
Date: Fri, 16 Feb 2018 10:27:10 -0800
Subject: [PATCH 2/5] fix: log ranges were not being cleared correctly

---
 fdbclient/FileBackupAgent.actor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fdbclient/FileBackupAgent.actor.cpp b/fdbclient/FileBackupAgent.actor.cpp
index a5370486d4..52b6c10dcd 100644
--- a/fdbclient/FileBackupAgent.actor.cpp
+++ b/fdbclient/FileBackupAgent.actor.cpp
@@ -1748,9 +1748,10 @@ namespace fileBackup {
 			state Version beginVersion = Params.beginVersion().get(task);
 			state Version endVersion = Params.endVersion().get(task);
 			state Reference<TaskFuture> taskFuture = futureBucket->unpack(task->params[Task::reservedTaskParamKeyDone]);
+			state BackupConfig config(task);
 
 			if(Params.fileSize().exists(task)) {
-				BackupConfig(task).logBytesWritten().atomicOp(tr, Params.fileSize().get(task), MutationRef::AddValue);
+				config.logBytesWritten().atomicOp(tr, Params.fileSize().get(task), MutationRef::AddValue);
 			}
 
 			if (Params.addBackupLogRangeTasks().get(task)) {
@@ -1761,7 +1762,7 @@ namespace fileBackup {
 			}
 
 			if(endVersion > beginVersion) {
-				Standalone<VectorRef<KeyRangeRef>> ranges = getLogRanges(beginVersion, endVersion, task->params[FileBackupAgent::keyConfigLogUid]);
+				Standalone<VectorRef<KeyRangeRef>> ranges = getLogRanges(beginVersion, endVersion, config.getUidAsKey());
 				for (auto & rng : ranges)
 					tr->clear(rng);
 			}

From 1debc59cb53a3c1befda094ff3fb93b9cec3a608 Mon Sep 17 00:00:00 2001
From: Bhaskar Muppana <mbhaskar@apple.com>
Date: Fri, 16 Feb 2018 11:06:01 -0800
Subject: [PATCH 3/5] Generate new WIX Installer GUID

---
 packaging/msi/FDBInstaller.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/msi/FDBInstaller.wxs b/packaging/msi/FDBInstaller.wxs
index 04fac4ba0e..5066b7d169 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='{999DE80B-0F53-490D-849B-E8C7620939E2}'
+           Id='{00458EF6-7578-45E9-A4CA-DF2096BF3B8C}'
            UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
            Version='$(var.Version)'
            Manufacturer='$(var.Manufacturer)'

From 816a609cb977ab78e4b799a15152381ef64e52ff Mon Sep 17 00:00:00 2001
From: Bhaskar Muppana <mbhaskar@apple.com>
Date: Fri, 16 Feb 2018 13:13:23 -0800
Subject: [PATCH 4/5] Generate new WIX Installer GUID - post release

---
 packaging/msi/FDBInstaller.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/msi/FDBInstaller.wxs b/packaging/msi/FDBInstaller.wxs
index 5066b7d169..e49398eb30 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='{00458EF6-7578-45E9-A4CA-DF2096BF3B8C}'
+           Id='{61C46988-7589-4B8A-9BB9-D850FD5B8B05}'
            UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
            Version='$(var.Version)'
            Manufacturer='$(var.Manufacturer)'

From fe3f0d9343549bcbb2533979534bb1117d4b79ce Mon Sep 17 00:00:00 2001
From: Bhaskar Muppana <mbhaskar@apple.com>
Date: Fri, 16 Feb 2018 13:33:48 -0800
Subject: [PATCH 5/5] Bumping version to next minor release - 5.1.3

---
 versions.target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.target b/versions.target
index 11a5075577..10c96af7dd 100644
--- a/versions.target
+++ b/versions.target
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Version>5.1.2</Version>
+    <Version>5.1.3</Version>
     <PackageName>5.1</PackageName>
   </PropertyGroup>
 </Project>