From 1210a2e7e1e045a5968b2703784da3b9b140b2b8 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Tue, 24 Jan 2017 17:49:55 -0800
Subject: [PATCH] Roll FTL (#3360)

---
 DEPS                   |  2 +-
 travis/licenses.golden | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/DEPS b/DEPS
index f2a673767..d51ec37d7 100644
--- a/DEPS
+++ b/DEPS
@@ -55,7 +55,7 @@ deps = {
    # and not have to specific specific hashes.
 
   'src/lib/ftl':
-   Var('fuchsia_git') + '/ftl' + '@' + '9f51f24056554352b045fda338e9101c0e5af272',
+   Var('fuchsia_git') + '/ftl' + '@' + 'bb82d5f52ecca65650817a1c31c1f49eca54237a',
 
   'src/lib/tonic':
    Var('fuchsia_git') + '/tonic' + '@' + '4214b35e02a1286a5fb98895d0c480fa0da10f6d',
diff --git a/travis/licenses.golden b/travis/licenses.golden
index a83cd0429..350e6e416 100644
--- a/travis/licenses.golden
+++ b/travis/licenses.golden
@@ -48983,8 +48983,11 @@ FILE: ../../../lib/ftl/functional/closure.h
 FILE: ../../../lib/ftl/functional/make_copyable.h
 FILE: ../../../lib/ftl/functional/make_copyable_unittest.cc
 FILE: ../../../lib/ftl/functional/make_runnable.h
-FILE: ../../../lib/ftl/log_level.cc
 FILE: ../../../lib/ftl/log_level.h
+FILE: ../../../lib/ftl/log_settings.cc
+FILE: ../../../lib/ftl/log_settings.h
+FILE: ../../../lib/ftl/log_settings_state.cc
+FILE: ../../../lib/ftl/log_settings_unittest.cc
 FILE: ../../../lib/ftl/logging.cc
 FILE: ../../../lib/ftl/logging.h
 FILE: ../../../lib/ftl/macros.h
@@ -49001,6 +49004,9 @@ FILE: ../../../lib/ftl/memory/weak_ptr_unittest.cc
 FILE: ../../../lib/ftl/strings/ascii.cc
 FILE: ../../../lib/ftl/strings/ascii.h
 FILE: ../../../lib/ftl/strings/ascii_unittest.cc
+FILE: ../../../lib/ftl/strings/concatenate.cc
+FILE: ../../../lib/ftl/strings/concatenate.h
+FILE: ../../../lib/ftl/strings/concatenate_unittest.cc
 FILE: ../../../lib/ftl/strings/split_string.cc
 FILE: ../../../lib/ftl/strings/split_string.h
 FILE: ../../../lib/ftl/strings/split_string_unittest.cc
@@ -72153,4 +72159,4 @@ freely, subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 ====================================================================================================
 Total license count: 693
-     31666 of 31666 ██████████ 100% (0 missing licenses)  Done.    
+     31672 of 31672 ██████████ 100% (0 missing licenses)  Done.    
-- 
GitLab