From 1aa32291f3a2fa23eba0e6055369dd726c224629 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <ajbeamon@apple.com>
Date: Thu, 8 Mar 2018 13:14:15 -0800
Subject: [PATCH] Fix line endings of backported changes.

---
 fdbclient/FileBackupAgent.actor.cpp |  8 ++++----
 fdbclient/NativeAPI.actor.cpp       | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fdbclient/FileBackupAgent.actor.cpp b/fdbclient/FileBackupAgent.actor.cpp
index 69f30f2a389..8ba1c99618e 100644
--- a/fdbclient/FileBackupAgent.actor.cpp
+++ b/fdbclient/FileBackupAgent.actor.cpp
@@ -62,10 +62,10 @@ static Future<Optional<int64_t>> getTimestampFromVersion(Optional<Version> ver,
 	return timeKeeperEpochsFromVersion(ver.get(), tr);
 }
 
-// Time format :
-// <= 59 seconds
-// <= 59.99 minutes
-// <= 23.99 hours
+// Time format :
+// <= 59 seconds
+// <= 59.99 minutes
+// <= 23.99 hours
 // N.NN days
 std::string secondsToTimeFormat(int64_t seconds) {
 	if (seconds >= 86400)
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 531df504548..193260f7207 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -885,12 +885,12 @@ Reference<ProxyInfo> DatabaseContext::getMasterProxies() {
 }
 
 //Actor which will wait until the ProxyInfo returned by the DatabaseContext cx is not NULL
-ACTOR Future<Reference<ProxyInfo>> getMasterProxiesFuture(DatabaseContext *cx) {
-	loop{
-		Reference<ProxyInfo> proxies = cx->getMasterProxies();
-		if (proxies)
-			return proxies;
-		Void _ = wait( cx->onMasterProxiesChanged() );
+ACTOR Future<Reference<ProxyInfo>> getMasterProxiesFuture(DatabaseContext *cx) {
+	loop{
+		Reference<ProxyInfo> proxies = cx->getMasterProxies();
+		if (proxies)
+			return proxies;
+		Void _ = wait( cx->onMasterProxiesChanged() );
 	}
 }