Copyright header

author: Jon Bratseth <bratseth@yahoo-inc.com> 2017-06-13 18:43:39 +0200
committer: Jon Bratseth <bratseth@yahoo-inc.com> 2017-06-13 18:43:39 +0200
commit: 4e5d87a9baa4176a1089f7afd1f433a8da275725 (patch)
tree: 23f2b54901b81b5c56dbf4a8c064658985962ead /fnet
parent: 76221b9e73ad7a76a8179663e638b545a470c325 (diff)
131 files changed, 132 insertions, 918 deletions
diff --git a/fnet/CMakeLists.txt b/fnet/CMakeLists.txt
index 3136c8654e9..b18399960f5 100644
--- a/fnet/CMakeLists.txt
+++ b/fnet/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_define_module(
     DEPENDS
     fastos
diff --git a/fnet/RELEASEINFO b/fnet/RELEASEINFO
deleted file mode 100644
index c4a53d9f1dc..00000000000
--- a/fnet/RELEASEINFO
+++ /dev/null
@@ -1,788 +0,0 @@
-=======================================================================
-                         FNET CURRENT (2006-04-24)
-.......................................................................
-
-
-Misc
-----
-
-- (2007-01-12) Make enabling/disabling the direct write optimization
-  runtime rather than compile time.
-
-
-Bugfixes
---------
-
-- (2007-01-09) Don't open new channels unless the channel id was
-  invented by our peer. Also, don't send a reply when an rpc request
-  error occurs. (avoid infinite error response loop)
-
-- (2006-09-21) Handle BAD_REQUEST/NULL method name case. When a bad
-  request was handled, the method name (NULL) would cause the method
-  lookup to crash. This should be resolved now.
-
-- On connection close: discard packets from the inner packet queue
-  even if the outer packet queue is empty. Not doing this could
-  trigger a resource leak if a dummy packet responsible for cleanup
-  (and channel closing) was left in the inner queue after the
-  connection was closed.
-
-
-=======================================================================
-                         FNET V_2_0_0_RELEASE
-.......................................................................
-
-
-New Dependencies
-----------------
-
-- vespalib (for test framework)
-
-
-Removed Code/Features
----------------------
-
-- Moved the core test framework into vespalib. FNET now depends on
-  vespalib for this. The FNET test framework is now implemented on top
-  of the test framework supplied by vespalib. Also, the vespalib test
-  script (testrun.sh) is used to control the running of FNET tests.
-
-- Removed FNET_LogHandler class. This removes the simple logging
-  framework located in FNET. It was deprecated several versions ago,
-  and all internal logging in FNET is now done using the new log
-  module.
-
-- Removed OO RPC Support (RPC with support for objects and
-  classes). This is done to simplify the overall design of RPC, which
-  also makes it simpler to implement compatible components in other
-  languages. RPC packet codes and error codes have been re-enumerated
-  to cover up the holes left by the removed support for OO RPC. The
-  protocol documentation has been modified to reflect the new RPC
-  design. NB: this makes RPC incompatible with older versions of FNET.
-
-
-Spiral
-------
-
-Spiral is a simplified single-threaded RPC abstraction layer. It is
-intended for truly single-threaded applications that does not want to
-mess around with the complete FNET API. Spiral currently only supports 
-the RPC client aspect.
-
-
-New Features
-------------
-
-- Added support for limiting the size of input/output buffers for
-  connections. This is done by invoking the
-  FNET_Transport::SetMaxInputBufferSize and
-  FNET_Transport::SetMaxOutputBufferSize methods.
-
-- Added FNET_Connection::GetQueueLen method that may be used to obtain the
-  number of packets currently located in the packet output queue.
-
-- Added support for enable/disable read and disable write events for
-  io components. This is used by the support to select on external
-  file descriptors.
-
-- Added support to shrink databuffers. This is used by the support to
-  limit input/output buffers.
-
-- Added support for selecting on external file descriptors by using
-  the FNET IO component framework. This includes using the
-  FNET_FDSelector class and the FNET_IFDSelectorHandler interface.
-
-- Better support for single-threaded compile. The test system has
-  been modified to work when compiled single-threaded. A new test
-  macro named TEST_THREADS may be used by tests that need threads to
-  run. This will result in the test begin skipped if threads are not
-  supported.
-
-- Added FRT_ISharedBlob interface with corresponding support. This may
-  be used to share the same memory regions between multiple
-  requests. Also, all shared blobs will be subref'ed by the request
-  as soon as the request packet is encoded to the connection output
-  buffer.
-
-
-Bugfixes
---------
-
-- Fixed a minor bug in the xsync daemon; close other end of pipe after
-  fork, to avoid hang in mother process if child fails.
-
-
-=======================================================================
-                         FNET V_1_4_9_RELEASE
-.......................................................................
-
-
-Robustness
-----------
-
-- Make task scheduling more robust in cases where the event loop
-  latency is very high. (ref Bug #462022)
-
-
-=======================================================================
-                         FNET V_1_4_8_RELEASE
-.......................................................................
-
-
-=======================================================================
-                         FNET V_1_4_7_RELEASE
-.......................................................................
-
-
-Misc
-----
-
-- Minor timing adjustments in the RPC invoke test to make it work
-  better.
-
-
-=======================================================================
-                         FNET V_1_4_6_RELEASE
-.......................................................................
-
-
-=======================================================================
-                         FNET V_1_4_5_RELEASE
-.......................................................................
-
-
-=======================================================================
-                         FNET V_1_4_4_RELEASE
-.......................................................................
-
-
-Misc
-----
-
-- avoid some warnings with gcc 4 (weffc++)
-
-
-Bugfixes
---------
-
-- check if _adminChannel is closed while waiting for callbacks
-  (in the CloseAdminChannel method)
-
-
-=======================================================================
-                         FNET V_1_4_3_RELEASE
-.......................................................................
-
-
-Misc
-----
-
-- use vtag stuff in fastos to report fnet version
-  (to avoid empty release hassle)
-
-- Better support for make -j
-
-
-=======================================================================
-                         FNET V_1_4_2_RELEASE
-.......................................................................
-
-
-[NB: no changes at all; still identifies as 1.4.1]
-
-
-=======================================================================
-                         FNET V_1_4_1_RELEASE
-.......................................................................
-
-
-=======================================================================
-                         FNET V_1_4_0_RELEASE
-.......................................................................
-
-
-Public testing toolkit
-----------------------
-
-The FNET testing toolkit has been made public and is now a part of the
-fnet library. The macros have been renamed to all start with
-'TEST_'. The local fnet tests have been modified and an example test
-program has been added.
-
-
-New logging API
----------------
-
-All logging has been converted to use the new "log" module
-and its API.  All functions in class FNET_LogHandler are now
-deprecated, in particular FNET_LogHandler::SetLogMask and
-FNET_LogHandler::SetLogHandler no longer have any effect.
-All users of fnet will need to link with the "log" library.
-
-
-Misc
-----
-
-- thread_id test is void'ed if fnet is compiled without threads.
-
-
-=======================================================================
-                         FNET V_1_3_0_RELEASE
-.......................................................................
-
-
-FRT/RPC Lobotomy/Cleanup
-------------------------
-
-The support for local invocation (and location transparency) is
-removed. The code is also somewhat simplified to reflect the now less
-general nature of things. It hurts to see so much thought go down the
-drain, but it greatly reduces maintenance complexity and simplifies
-future development. Who needs sub microsecond invocations anyway...
-
-Changed code to avoid warning messages produced by gcc 3.3 and later 
-when compiling with the -Weffc++ option.
-
-
-Removed Code
-------------
-
-- FNET_ITransportHook
-- FNET_IPingable
-- FNET_Pinger
-- FNET_ServerInfo
-- FNET_Transport::SetMinEventTimeOut
-- FNET_Transport::SetPingInterval
-- FNET_Transport::AddPingTarget
-- FNET_Transport::RemovePingTarget
-- FNET_Transport::HookNow
-
-
-New Features
-------------
-
-- Added preliminary support for 2-way RPC.
-
-- Added support for invoking RPC methods without having an FRT_Target.
-
-- Added a Reset() method to the reflection manager that removes all
-  methods.
-
-- Added a method mismatch rpc hook that may be used to catch method
-  calls not matching any methods.
-
-- Added support for rpc session state (All rpc calls made on a single
-  connection is referred to as a session). This was done by adding a
-  context to each connection (used to store the session state), making
-  it possible to obtain the underlying connection given
-  the rpc request object and adding special rpc hooks that are called
-  when a connection is established, when a connection is lost and
-  right before a connection is deleted.
-
-- The transport object now comes with a built-in scheduler object.
-
-- The FNET_Scheduler constructor may be given the current time. This
-  simplifies running the scheduler in a simulated environment.
-
-- A Sync method has been added to the connection class. This method
-  may be used to block until all previously posted packets have been
-  encoded.
-
-- Added InTub method to the memorytub class. This method may be used
-  to check if the tub owns a given byte of memory. This feature is
-  primarily used for regression testing.
-
-- The FNET_Connector class has been given a GetPortNumber method to be
-  able to extract the port number of the underlying server socket.
-
-- Allow listening on port number 0.
-
-- Add FRT_Target::GetConnection() method. Only returns a pointer to
-  the connection owned by the target. No new references are allocated.
-
-
-API changes
------------
-
-- The FRT supervisor may be constructed either in stand-alone mode, or
-  based on an external transport object and an external thread
-  pool. The transport proxy methods may only be used when in
-  stand-alone mode.
-
-- The scheduler no longer implements the transport hook interface
-  (removed). The virtual Tick method has been replaced by the
-  non-virtual CheckTasks method.
-
-- The transport Main/Start methods no longer take a transport hook as
-  parameter (the interface has been removed). Similar functionality
-  may now be obtained by using the transport InitEventLoop and
-  EventLoopIteration methods.
-
-- The RPC target InvokeAsync method now returns bool, true means that
-  the method completed immediately. false means the invocation is in
-  progress.
-
-- The FRT_IRequestWait::RequestDone method now takes a second
-  parameter; a bool indicating whether this invocation is done
-  synchronously (directly from the invoke method).
-
-
-Internal changes
-----------------
-
-- Added IOC CleanupHook method that is called right before an IOC is
-  deleted. This is used by the FNET_Connection class to support a
-  connection cleanup callback which in turn is used by the FRT_Supervisor to
-  activate the SessionFini hook needed for RPC session support.
-
-- Statistics updating is now done with a scheduled stats update
-  task. This reduces the complexity of the event loop.
-
-- The connection write method now avoids writing 0 bytes to the
-  network. Also, empty writes are silently ignored since using the
-  packet queue for control packets is perfectly legal.
-
-- Channel IDs are now chosen in a way that is future compatible with
-  2-way channel creation.
-
-
-Misc
-----
-
-- Store listen/connect spec in IOC and use it in IOC related log
-  messages.
-
-- Added rpc proxy example program that may be useful for debugging.
-
-- Added FNET_DummyPacket helper packet class that may be used to
-  implement hooks in the connection output packet queue.
-
-- The FNET_Packet::NoPCODE() and FNET_Connection::NoID() methods have
-  been replaced by the FNET_NOID macro.
-
-- Added FNET_ prefix to DISABLE_DIRECT_WRITE compile flag.
-
-- Added FNET_SANITY_CHECKS compile flag. This enables some extra
-  sanity checks in the event loop.
-
-- Added generic cross-host testing support as part of testing
-  framework (xtest make target removed). This includes the xsync
-  daemon used to sync test states between hosts. The environment
-  variables PORTBASE and PEER are used to control testing behavior.
-
-- In regression test framework: enable output from passed test cases
-  to be collapsed to reduce logging.
-
-- Added support for mutex instrumentation. This requires a version of
-  FastOS supporting instrumented mutexes.
-
-- Added FRT_Supervisor::GetListenPort() method.
-
-
-Bugfixes
---------
-
-- RPC: Handle request return (after request detach) while still
-  inside sync invocation method correctly (also added to regress
-  test).
-
-- RPC: ensure that the cleanup handler is run also when the request is
-  recycled by the user without making the trip back to the request
-  pool.
-
-
-=======================================================================
-                         FNET V_1_2_4_RELEASE
-.......................................................................
-
-
-Bugfixes
---------
-
-- Wait for direct write to complete before discarding packets when the
-  connection is going down.
-
-
-=======================================================================
-                         FNET V_1_2_3_RELEASE
-.......................................................................
-
-
-New Features
-------------
-
-- Added support for sending multiple packets at the same time. This
-  may reduce TCP latency when used with Nagle's algorithm.
-
-
-=======================================================================
-                         FNET V_1_2_2_RELEASE
-.......................................................................
-
-
-Bugfixes
---------
-
-- Fix Makefile to work with parallel compilation (gcc -j option).
-
-
-=======================================================================
-                         FNET V_1_2_1_RELEASE
-.......................................................................
-
-
-Misc
-----
-
-- Max events per event loop iteration: 256 -> 4096
-
-
-Bugfixes
---------
-
-- Avoid overlap between chunk header and chunk data in FRT memorytub.
-
-- Remove race around single req wait where condition could be
-  destructed while being locked.
-
-- Don't set connection state to closed if connect fails
-  synchronously. This caused a channel lost event to be sent on the
-  admin channel that caused a deadlock in the serverinfo class. It is
-  also an API improvement, since connect now fails either
-  synchronously or asynchronously (not both).
-
-
-=======================================================================
-                         FNET V_1_2_0_RELEASE
-.......................................................................
-
-
-New Features
-------------
-
-- Added support to construct an FNET_DataBuffer based on a
-  preallocated buffer.
-
-- Added support for scheduling a task to be run as soon as possible.
-
-- Added support for killing a task so that it may not be scheduled in
-  the future.
-
-- Added databuffer methods to write data without checking for free
-  space. These methods have a 'Fast' suffix.
-
-- Added AssertValid method that may be called anytime to assert that
-  the databuffer is in a legal state.
-
-- Added endian detection. Use the FNET_Info::GetEndian method to
-  obtain host endian.
-
-- Added methods to read/peek information stored in reverse internet
-  order (little endian) in a databuffer.
-
-- VPATH compilation.
-
-
-Internal Changes
-----------------
-
-- Removed asserts used to check for valid data in databuffer read
-  methods.
-
-- When posting a packet, try to write it to the network directly (if
-  there is no other pending write operations). Post
-  an enable write event to the transport thread if there is pending
-  work after a direct write has been attempted. This behavior may be
-  disabled by using the --disable-direct-write configure option.
-
-
-Misc
-----
-
-- Added static instance of FNET_CMD_NOCOMMAND control packet for
-  completeness.
-
-- Moved fastserver stuff to the fastserver4 cvs module.
-
-- Simple regress test framework. Run tests with 'make test' from
-  fnet/src. Use 'make xtest' to run cross-host testing. This requires
-  setting the PORT and PEER environment variables to sane
-  value. Example: to run a cross-host test between host A and host B
-  using port 8000 (on both hosts); run 'make PORT=8000 PEER=B xtest'
-  on host A and 'make PORT=8000 PEER=A xtest' on host B.
-
-
-Bugfixes
---------
-
-- Set connection state correctly if socket connect completes
-  synchronously.
-
-
-FRT ([F]NET [R]emote [T]ools) [middle-ware library]
----------------------------------------------------
-
-The FRT library is a layer on top of FNET supporting a proprietary RPC
-protocol. In addition to the network protocol, the FRT library also
-contains API support for location transparent dynamic method
-invocation (examples and regress tests also included).
-
-
-=======================================================================
-                         FNET V_1_1_2_RELEASE
-.......................................................................
-
-
-Bugfixes
---------
-
-- Handle EOL returned from socket read. This lets FNET handle peers
-  that close connections nicely. Previously this would result in a
-  very tight event loop reading EOL from the socket in each iteration.
-
-- Avoid time measurement errors in scheduler by using absolute values
-  for bucket timeouts rather than accumulated delta values. If the
-  scheduler was invoked very often, it would appear that time stood
-  still.
-
-
-=======================================================================
-                         FNET V_1_1_1_RELEASE
-.......................................................................
-
-
-Compiler nitpicks
------------------
-
-- Renamed TICK to SLOT_TICK in scheduler class to avoid conflict with
-  macro on Solaris.
-- Removed comma at end of enums in fs4 example packet library.
-- Use public inheritance in fsearch_maxthreads fs4 example
-  application.
-- Conceal infinite loop in fsearch_somethreads fs4 example
-  application.
-- Cast error-code to signed value before applying negation in
-  fs4 searchtest example application.
-- Cast enum to uint32_t to avoid constructor confusion in proxy
-  example application.
-- Explicitly cast stat values to float.
-
-
-Misc
-----
-
-- Removed memory leak in scheduling test to avoid HUGE memory leak
-  report on application exit.
-
-
-=======================================================================
-                         FNET V_1_1_0_RELEASE
-.......................................................................
-
-
-API Changes
------------
-
-Added method bool FNET_IServerAdapter::InitAdminChannel(FNET_Channel
-*) That must be implemented by server applications using FNET. The
-method is called when a new incoming connection has been established
-in order to let the application keep track of its current
-clients. This channel works just like normal channels. The only
-difference is that it is opened before any packets are received,
-thereby allowing the application to implement connection-oriented
-stuff like proxies. Implementing this method to always return false
-will preserve old behavior. NOTE: closing the connection directly (by
-invoking Close()) is allowed from the InitAdminChannel method (This is
-an exception from the general rule that the application should close
-all connections with async events. The reason for this exception is to
-allow better resource management).
-
-Added an FNET_Context parameter to the FNET_Connection constructor and
-to the FNET_Transport::Connect method. This was done to enable the
-application to set the admin channel context in the client end-point
-of a connection. Also, VOIDP=NULL is used as default context, instead
-of the previously used INT=0xffffffff (FNET_Connection::NoID()).
-
-Added a parameter of type FNET_ITransportHook to the
-FNET_Transport::Start method in order to enable sharing the transport
-thread without the need to create a wrapper object (The parameter is
-optional with NULL as default value).
-
-Made the FNET_ITransportHook parameter to the FNET_Transport::Main
-method optional (default value is NULL).
-
-Server info objects may now be marked as 'bad'
-[MarkBad()/ClearBad()/IsBad()]. If a server (info) is marked as bad,
-FNET will try to keep it down, rather than up. Note that node badness
-may be set by the application code in any thread and is not protected
-by any locks. The most sensible use of this flag would be to use it as
-an async signal, raising it if a server goes bad, and never lowering
-it again (ClearBad() is implemented for completeness, but needs to be
-used with care).
-
-Added new method FNET_Channel::CloseAndFree() that may be used to
-close and free a channel in a single operation. This is equivalent
-with first invoking Close(), then Free(), but is more efficient.
-
-The packet streamer interface has been modified in order to support
-context-dependent un-streaming of packets and variable length packet
-headers. This has resulted in the following method changes:
-
------
-bool
-FNET_IServerAdapter::InitChannel(FNET_Channel *channel,
-                                 FNET_Packet *packet)
------
-||
-\/
------
-bool
-FNET_IServerAdapter::InitChannel(FNET_Channel *channel,
-                                 uint32_t pcode)
------
-
-This reflects the fact that in order to do context-dependent packet
-un-streaming, we need to resolve the context of the channel that
-should receive the packet before un-streaming the packet. This also
-means that the packet itself is not available when opening server-side
-channels.
-
------
-FNET_Packet *
-FNET_IPacketFactory::CreatePacket(uint32_t pcode)
------
-||
-\/
------
-FNET_Packet *
-FNET_IPacketFactory::CreatePacket(uint32_t pcode, FNET_Context context)
------
-
-The context is propagated to the packet factory in order to eliminate
-the need to change the FNET_Packet::Decode(...) method.
-
------
-uint32_t
-FNET_IPacketStreamer::GetHeaderLen()
-
-uint32_t
-FNET_IPacketStreamer::GetPacketLen(FNET_DataBuffer *src)
------
-||
-\/
------
-bool
-FNET_IPacketStreamer::GetPacketInfo(FNET_DataBuffer *src,
-                                    uint32_t *plen,
-                                    uint32_t *pcode,
-                                    uint32_t *chid,
-                                    bool *broken)
------
-
-The packet info is extracted before the packet is un-streamed in order
-to locate the channel that should receive the packet. This change
-gives us support for variable length packet headers and a way to
-signal that the connection is broken.
-
------
-FNET_Packet *
-FNET_IPacketStreamer::Decode(FNET_DataBuffer *src, uint32_t *chid)
------
-||
-\/
------
-FNET_Packet *
-FNET_IPacketStreamer::Decode(FNET_DataBuffer *src, uint32_t plen,
-                             uint32_t pcode, FNET_Context context)
------
-
-The packet info is injected as parameters to avoid having to extract
-it from the packet a second time. Note that the chid has been replaced
-by the context of the channel that will receive the packet. This
-completes the support for context-dependent packet un-streaming.
-
-
-Internal Changes
-----------------
-
-Allow IOC_DELETE event before IOC_ADD event. This enables the
-application to post an event indicating that the connection itself
-should be closed when invoked to open the admin channel on that
-connection (only applies to server connections).
-
-Optimized FNET_DataBuffer by using pointers to define dead/data/free
-sections of the buffer.
-
-Each connection now has its own FNET_ChannelPool object instead of
-sharing an FNET_ObjectPool. This reduces locking.
-
-The methods on FNET_Channel has been un-inlined in order to
-instantiate FNET_Connection objects with an inlined FNET_ChannelPool
-object which in turn has inline FNET_Channel objects.
-
-Make sure that the packets posted on a connection are freed in the
-same order as they were posted, even if the connection goes down. This
-is done to enable the application to use packet free order for syncing
-purposes. It also enables the usage of packets that perform code in
-the free method that requires that all previously posted packets have
-already been freed (Like memory pool cleanup code).
-
-Changed some log messages to FNET_LOG_DEBUG.
-
-
-New Control Packets
--------------------
-
-- FNET_CMD_TIMEOUT : This control packet command may be used to signal
-                     a timeout. Note that FNET does not use timeout
-                     packets internally. They are only included to
-                     ease the implementation of timeout signaling in
-                     applications using FNET.
-
-- FNET_CMD_BAD_PACKET : This control packet signals the reception of
-                        a packet that could not be un-streamed. It
-                        will be delivered in place of the packet that
-                        was invalid.
-
-
-New Classes
------------
-
-- FNET_Task (schedulable tasks; timeouts etc.)
-- FNET_Scheduler (class for scheduling tasks)
-- FNET_ChannelPool (per-connection channel pooling)
-
-
-Removed Classes
----------------
-
-- FNET_ObjectPool
-
-
-New Examples
-------------
-
-- proxy : A simple proxy implementation showing how FNET may be used
-          to handle raw data as packets and also how to focus on
-          connections rather than channels.
-
-- timeout : Simple application showing how to use the
-            task/scheduler classes to implement timeout support.
-
-
-Bugfixes
---------
-
-- use maxreconnectdelay if the connect failed synchronously.
-
-- don't try to connect to target host if basic socket init fails.
-
-
-=======================================================================
-                         FNET V_1_0_0_RELEASE
-.......................................................................
-
-
-Initial release.
-
-NOTE: 1.0.x is no longer supported.
diff --git a/fnet/build/buildspec.xml b/fnet/build/buildspec.xml
index adc792e0692..22ce5b93d4a 100644
--- a/fnet/build/buildspec.xml
+++ b/fnet/build/buildspec.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <BuildSpecification>
   <Owner>
     <OwnerName></OwnerName>
diff --git a/fnet/ethereal/Makefile.am b/fnet/ethereal/Makefile.am
index 7f169f25afa..69951b02e2a 100644
--- a/fnet/ethereal/Makefile.am
+++ b/fnet/ethereal/Makefile.am
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # Makefile.am
 # Automake file for plugin
 
diff --git a/fnet/ethereal/Makefile.nmake b/fnet/ethereal/Makefile.nmake
index c743e4c011b..2d07f9e349f 100644
--- a/fnet/ethereal/Makefile.nmake
+++ b/fnet/ethereal/Makefile.nmake
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
diff --git a/fnet/ethereal/moduleinfo.h b/fnet/ethereal/moduleinfo.h
index de49ef89a67..4430ccf0bd9 100644
--- a/fnet/ethereal/moduleinfo.h
+++ b/fnet/ethereal/moduleinfo.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /* Included *after* config.h, in order to re-define these macros */
 
 #ifdef PACKAGE
diff --git a/fnet/ethereal/packet-fnetrpc.c b/fnet/ethereal/packet-fnetrpc.c
index 370b5e29e70..d2ca9e7a8e8 100644
--- a/fnet/ethereal/packet-fnetrpc.c
+++ b/fnet/ethereal/packet-fnetrpc.c
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /* packet-fnetrpc.c */
 
 #ifdef HAVE_CONFIG_H
diff --git a/fnet/index.html b/fnet/index.html
index 154c336039a..cd9d3fa16b6 100644
--- a/fnet/index.html
+++ b/fnet/index.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <html>
   <title>FNET Home Page</title>
   <body>
diff --git a/fnet/src/Doxyfile b/fnet/src/Doxyfile
index bcd82f9a841..1b5ce071efc 100644
--- a/fnet/src/Doxyfile
+++ b/fnet/src/Doxyfile
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # Doxyfile 1.2.15
 
 # This file describes the settings to be used by the documentation system
diff --git a/fnet/src/examples/frt/rpc/CMakeLists.txt b/fnet/src/examples/frt/rpc/CMakeLists.txt
index 0d71ba4f91e..914525a2a57 100644
--- a/fnet/src/examples/frt/rpc/CMakeLists.txt
+++ b/fnet/src/examples/frt/rpc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_rpc_server_app
     SOURCES
     rpc_server.cpp
diff --git a/fnet/src/examples/frt/rpc/echo_client.cpp b/fnet/src/examples/frt/rpc/echo_client.cpp
index b5c93090566..9d73d38cd1e 100644
--- a/fnet/src/examples/frt/rpc/echo_client.cpp
+++ b/fnet/src/examples/frt/rpc/echo_client.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
index b40085e3db6..801de59b515 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
index 1e0a595fe80..33207282bcc 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/fnet/src/examples/frt/rpc/rpc_client.cpp b/fnet/src/examples/frt/rpc/rpc_client.cpp
index 0b5be4a5510..cc230d2bc7c 100644
--- a/fnet/src/examples/frt/rpc/rpc_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_client.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/fnet/src/examples/frt/rpc/rpc_info.cpp b/fnet/src/examples/frt/rpc/rpc_info.cpp
index 78313a46baa..5f17e69a10d 100644
--- a/fnet/src/examples/frt/rpc/rpc_info.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_info.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/fnet/src/examples/frt/rpc/rpc_invoke.cpp b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
index f1e93f3b2dc..b23e316e5cd 100644
--- a/fnet/src/examples/frt/rpc/rpc_invoke.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/fnet/src/examples/frt/rpc/rpc_proxy.cpp b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
index 9527b0df6b6..496190b2b80 100644
--- a/fnet/src/examples/frt/rpc/rpc_proxy.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/fnet/src/examples/frt/rpc/rpc_server.cpp b/fnet/src/examples/frt/rpc/rpc_server.cpp
index b05fe15f663..8947663216e 100644
--- a/fnet/src/examples/frt/rpc/rpc_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_server.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/fnet/src/examples/ping/CMakeLists.txt b/fnet/src/examples/ping/CMakeLists.txt
index ff635799848..b8ea10402a8 100644
--- a/fnet/src/examples/ping/CMakeLists.txt
+++ b/fnet/src/examples/ping/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_pingserver_app
     SOURCES
     packets.cpp
diff --git a/fnet/src/examples/ping/packets.cpp b/fnet/src/examples/ping/packets.cpp
index e9f5121c99a..e5e9f645c9a 100644
--- a/fnet/src/examples/ping/packets.cpp
+++ b/fnet/src/examples/ping/packets.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/fnet.h>
 #include "packets.h"
diff --git a/fnet/src/examples/ping/packets.h b/fnet/src/examples/ping/packets.h
index 27a06bdaab3..b91a053723d 100644
--- a/fnet/src/examples/ping/packets.h
+++ b/fnet/src/examples/ping/packets.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <vespa/fnet/packet.h>
diff --git a/fnet/src/examples/ping/pingclient.cpp b/fnet/src/examples/ping/pingclient.cpp
index 6ed7f9a527c..1d65ef3b69c 100644
--- a/fnet/src/examples/ping/pingclient.cpp
+++ b/fnet/src/examples/ping/pingclient.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/fnet.h>
 #include <examples/ping/packets.h>
diff --git a/fnet/src/examples/ping/pingserver.cpp b/fnet/src/examples/ping/pingserver.cpp
index 52f55c35085..c4543134912 100644
--- a/fnet/src/examples/ping/pingserver.cpp
+++ b/fnet/src/examples/ping/pingserver.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/fnet.h>
 #include <examples/ping/packets.h>
diff --git a/fnet/src/examples/proxy/CMakeLists.txt b/fnet/src/examples/proxy/CMakeLists.txt
index 45710fc0779..3ee8d6ba007 100644
--- a/fnet/src/examples/proxy/CMakeLists.txt
+++ b/fnet/src/examples/proxy/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_proxy_app
     SOURCES
     proxy.cpp
diff --git a/fnet/src/examples/proxy/proxy.cpp b/fnet/src/examples/proxy/proxy.cpp
index 1b61244c093..653b445581f 100644
--- a/fnet/src/examples/proxy/proxy.cpp
+++ b/fnet/src/examples/proxy/proxy.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/fnet.h>
 #include <vespa/fastos/app.h>
diff --git a/fnet/src/examples/timeout/CMakeLists.txt b/fnet/src/examples/timeout/CMakeLists.txt
index 2f4a710c1f2..bde4741d990 100644
--- a/fnet/src/examples/timeout/CMakeLists.txt
+++ b/fnet/src/examples/timeout/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_timeout_app
     SOURCES
     timeout.cpp
diff --git a/fnet/src/examples/timeout/timeout.cpp b/fnet/src/examples/timeout/timeout.cpp
index af52f8b9853..bba58faca55 100644
--- a/fnet/src/examples/timeout/timeout.cpp
+++ b/fnet/src/examples/timeout/timeout.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/fnet.h>
 #include <vespa/fastos/app.h>
diff --git a/fnet/src/tests/connection_spread/CMakeLists.txt b/fnet/src/tests/connection_spread/CMakeLists.txt
index 6d02e842c9a..96abd381fae 100644
--- a/fnet/src/tests/connection_spread/CMakeLists.txt
+++ b/fnet/src/tests/connection_spread/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_connection_spread_test_app TEST
     SOURCES
     connection_spread_test.cpp
diff --git a/fnet/src/tests/connection_spread/connection_spread_test.cpp b/fnet/src/tests/connection_spread/connection_spread_test.cpp
index a10278daf32..11120ebc3dc 100644
--- a/fnet/src/tests/connection_spread/connection_spread_test.cpp
+++ b/fnet/src/tests/connection_spread/connection_spread_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/fnet.h>
 #include <vespa/vespalib/util/stringfmt.h>
diff --git a/fnet/src/tests/databuffer/CMakeLists.txt b/fnet/src/tests/databuffer/CMakeLists.txt
index 877d39cec60..19ec97be7a2 100644
--- a/fnet/src/tests/databuffer/CMakeLists.txt
+++ b/fnet/src/tests/databuffer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_databuffer_test_app TEST
     SOURCES
     databuffer.cpp
diff --git a/fnet/src/tests/databuffer/databuffer.cpp b/fnet/src/tests/databuffer/databuffer.cpp
index 7aa75a95e65..94b59095be4 100644
--- a/fnet/src/tests/databuffer/databuffer.cpp
+++ b/fnet/src/tests/databuffer/databuffer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/databuffer.h>
 
diff --git a/fnet/src/tests/examples/CMakeLists.txt b/fnet/src/tests/examples/CMakeLists.txt
index fed462f8115..8a4eb12ad83 100644
--- a/fnet/src/tests/examples/CMakeLists.txt
+++ b/fnet/src/tests/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_examples_test_app TEST
     SOURCES
     examples_test.cpp
diff --git a/fnet/src/tests/examples/examples_test.cpp b/fnet/src/tests/examples/examples_test.cpp
index 434c1ffa426..df5cceb624d 100644
--- a/fnet/src/tests/examples/examples_test.cpp
+++ b/fnet/src/tests/examples/examples_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/vespalib/util/slaveproc.h>
 #include <vespa/vespalib/util/stringfmt.h>
diff --git a/fnet/src/tests/frt/method_pt/CMakeLists.txt b/fnet/src/tests/frt/method_pt/CMakeLists.txt
index 6de4a51b0c9..6ec067a7cb4 100644
--- a/fnet/src/tests/frt/method_pt/CMakeLists.txt
+++ b/fnet/src/tests/frt/method_pt/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_method_pt_test_app TEST
     SOURCES
     method_pt.cpp
diff --git a/fnet/src/tests/frt/method_pt/method_pt.cpp b/fnet/src/tests/frt/method_pt/method_pt.cpp
index 98ab9d228a1..db5905d6871 100644
--- a/fnet/src/tests/frt/method_pt/method_pt.cpp
+++ b/fnet/src/tests/frt/method_pt/method_pt.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/fnet/frt/frt.h>
diff --git a/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt b/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt
index d61fffcd8db..e7c29cfc9d5 100644
--- a/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt
+++ b/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_parallel_rpc_test_app TEST
     SOURCES
     parallel_rpc_test.cpp
diff --git a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
index 723f519cd37..478e4b14f02 100644
--- a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
+++ b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/fnet/frt/frt.h>
diff --git a/fnet/src/tests/frt/rpc/CMakeLists.txt b/fnet/src/tests/frt/rpc/CMakeLists.txt
index 8cd50f13910..b426ed42397 100644
--- a/fnet/src/tests/frt/rpc/CMakeLists.txt
+++ b/fnet/src/tests/frt/rpc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_invoke_test_app TEST
     SOURCES
     invoke.cpp
diff --git a/fnet/src/tests/frt/rpc/detach_return_invoke.cpp b/fnet/src/tests/frt/rpc/detach_return_invoke.cpp
index 44f484cf064..54a891261c2 100644
--- a/fnet/src/tests/frt/rpc/detach_return_invoke.cpp
+++ b/fnet/src/tests/frt/rpc/detach_return_invoke.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/vespalib/util/stringfmt.h>
diff --git a/fnet/src/tests/frt/rpc/invoke.cpp b/fnet/src/tests/frt/rpc/invoke.cpp
index a1178f77f66..8f4f9dfca90 100644
--- a/fnet/src/tests/frt/rpc/invoke.cpp
+++ b/fnet/src/tests/frt/rpc/invoke.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/frt/frt.h>
 
diff --git a/fnet/src/tests/frt/rpc/session.cpp b/fnet/src/tests/frt/rpc/session.cpp
index a7b889dc71b..0316129a8b5 100644
--- a/fnet/src/tests/frt/rpc/session.cpp
+++ b/fnet/src/tests/frt/rpc/session.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/frt/frt.h>
diff --git a/fnet/src/tests/frt/rpc/sharedblob.cpp b/fnet/src/tests/frt/rpc/sharedblob.cpp
index 363a7891cbd..10eaad9c013 100644
--- a/fnet/src/tests/frt/rpc/sharedblob.cpp
+++ b/fnet/src/tests/frt/rpc/sharedblob.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/frt/frt.h>
diff --git a/fnet/src/tests/frt/values/CMakeLists.txt b/fnet/src/tests/frt/values/CMakeLists.txt
index f2f2f3dd915..cff62008d0c 100644
--- a/fnet/src/tests/frt/values/CMakeLists.txt
+++ b/fnet/src/tests/frt/values/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_values_test_app TEST
     SOURCES
     values_test.cpp
diff --git a/fnet/src/tests/frt/values/values_test.cpp b/fnet/src/tests/frt/values/values_test.cpp
index f5d17d4d7ca..5dd514bd10d 100644
--- a/fnet/src/tests/frt/values/values_test.cpp
+++ b/fnet/src/tests/frt/values/values_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/frt/values.h>
 #include <vespa/fnet/databuffer.h>
diff --git a/fnet/src/tests/info/CMakeLists.txt b/fnet/src/tests/info/CMakeLists.txt
index 4825617605b..ce69d462d84 100644
--- a/fnet/src/tests/info/CMakeLists.txt
+++ b/fnet/src/tests/info/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_info_test_app TEST
     SOURCES
     info.cpp
diff --git a/fnet/src/tests/info/info.cpp b/fnet/src/tests/info/info.cpp
index 383a5d018b9..5b93c3fcd3f 100644
--- a/fnet/src/tests/info/info.cpp
+++ b/fnet/src/tests/info/info.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/frt/frt.h>
 #include <mutex>
diff --git a/fnet/src/tests/locking/CMakeLists.txt b/fnet/src/tests/locking/CMakeLists.txt
index 21a48376b1c..481a98b1d81 100644
--- a/fnet/src/tests/locking/CMakeLists.txt
+++ b/fnet/src/tests/locking/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_drainpackets_test_app TEST
     SOURCES
     drainpackets.cpp
diff --git a/fnet/src/tests/locking/castspeed.cpp b/fnet/src/tests/locking/castspeed.cpp
index 859ec08ec69..153987c5516 100644
--- a/fnet/src/tests/locking/castspeed.cpp
+++ b/fnet/src/tests/locking/castspeed.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/fnet.h>
 
diff --git a/fnet/src/tests/locking/drainpackets.cpp b/fnet/src/tests/locking/drainpackets.cpp
index 5bb72a1a85d..05ba923376d 100644
--- a/fnet/src/tests/locking/drainpackets.cpp
+++ b/fnet/src/tests/locking/drainpackets.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/fnet.h>
 
diff --git a/fnet/src/tests/locking/dummy.cpp b/fnet/src/tests/locking/dummy.cpp
index af4a7fc2916..b381619eaab 100644
--- a/fnet/src/tests/locking/dummy.cpp
+++ b/fnet/src/tests/locking/dummy.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "dummy.h"
 
 DummyObj::DummyObj() {}
diff --git a/fnet/src/tests/locking/dummy.h b/fnet/src/tests/locking/dummy.h
index 9a3578b43e5..7471f7f28b7 100644
--- a/fnet/src/tests/locking/dummy.h
+++ b/fnet/src/tests/locking/dummy.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 class DummyObj
diff --git a/fnet/src/tests/locking/lockspeed.cpp b/fnet/src/tests/locking/lockspeed.cpp
index 5bdb83c9951..9932f6aa316 100644
--- a/fnet/src/tests/locking/lockspeed.cpp
+++ b/fnet/src/tests/locking/lockspeed.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/fnet.h>
 #include "dummy.h"
diff --git a/fnet/src/tests/printstuff/CMakeLists.txt b/fnet/src/tests/printstuff/CMakeLists.txt
index 75aa822120f..8039f107e3a 100644
--- a/fnet/src/tests/printstuff/CMakeLists.txt
+++ b/fnet/src/tests/printstuff/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_printstuff_test_app TEST
     SOURCES
     printstuff_test.cpp
diff --git a/fnet/src/tests/printstuff/printstuff_test.cpp b/fnet/src/tests/printstuff/printstuff_test.cpp
index f8593fb7b04..ef2d5e95d78 100644
--- a/fnet/src/tests/printstuff/printstuff_test.cpp
+++ b/fnet/src/tests/printstuff/printstuff_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/frt/rpcrequest.h>
 #include <vespa/fnet/packetqueue.h>
diff --git a/fnet/src/tests/scheduling/CMakeLists.txt b/fnet/src/tests/scheduling/CMakeLists.txt
index 17a2d00da4c..c442942e2f0 100644
--- a/fnet/src/tests/scheduling/CMakeLists.txt
+++ b/fnet/src/tests/scheduling/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_schedule_test_app TEST
     SOURCES
     schedule.cpp
diff --git a/fnet/src/tests/scheduling/schedule.cpp b/fnet/src/tests/scheduling/schedule.cpp
index 6fb928f7aeb..b563c7057ff 100644
--- a/fnet/src/tests/scheduling/schedule.cpp
+++ b/fnet/src/tests/scheduling/schedule.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/fnet.h>
 
diff --git a/fnet/src/tests/scheduling/sloweventloop.cpp b/fnet/src/tests/scheduling/sloweventloop.cpp
index a13205f4b0e..6c218e25da5 100644
--- a/fnet/src/tests/scheduling/sloweventloop.cpp
+++ b/fnet/src/tests/scheduling/sloweventloop.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/fnet.h>
 
diff --git a/fnet/src/tests/sync_execute/CMakeLists.txt b/fnet/src/tests/sync_execute/CMakeLists.txt
index 127d04fc456..fce699d8e83 100644
--- a/fnet/src/tests/sync_execute/CMakeLists.txt
+++ b/fnet/src/tests/sync_execute/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_sync_execute_test_app TEST
     SOURCES
     sync_execute.cpp
diff --git a/fnet/src/tests/sync_execute/sync_execute.cpp b/fnet/src/tests/sync_execute/sync_execute.cpp
index 8b0edb4476f..55a898496ae 100644
--- a/fnet/src/tests/sync_execute/sync_execute.cpp
+++ b/fnet/src/tests/sync_execute/sync_execute.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/transport.h>
 #include <vespa/fnet/iexecutable.h>
diff --git a/fnet/src/tests/thread_selection/CMakeLists.txt b/fnet/src/tests/thread_selection/CMakeLists.txt
index 3f8dd642834..bf005de9694 100644
--- a/fnet/src/tests/thread_selection/CMakeLists.txt
+++ b/fnet/src/tests/thread_selection/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_thread_selection_test_app TEST
     SOURCES
     thread_selection_test.cpp
diff --git a/fnet/src/tests/thread_selection/thread_selection_test.cpp b/fnet/src/tests/thread_selection/thread_selection_test.cpp
index 5e5f0891ba4..ecfe0c57d5c 100644
--- a/fnet/src/tests/thread_selection/thread_selection_test.cpp
+++ b/fnet/src/tests/thread_selection/thread_selection_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/fnet.h>
 #include <vespa/vespalib/util/stringfmt.h>
diff --git a/fnet/src/tests/time/CMakeLists.txt b/fnet/src/tests/time/CMakeLists.txt
index a2ff8431c4e..90af37face6 100644
--- a/fnet/src/tests/time/CMakeLists.txt
+++ b/fnet/src/tests/time/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fnet_timespeed_test_app TEST
     SOURCES
     timespeed.cpp
diff --git a/fnet/src/tests/time/timespeed.cpp b/fnet/src/tests/time/timespeed.cpp
index cdbaaa27781..2b43bc6c35a 100644
--- a/fnet/src/tests/time/timespeed.cpp
+++ b/fnet/src/tests/time/timespeed.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/fnet/fnet.h>
 
diff --git a/fnet/src/vespa/fnet/CMakeLists.txt b/fnet/src/vespa/fnet/CMakeLists.txt
index 9d496d63b4d..20badc5c489 100644
--- a/fnet/src/vespa/fnet/CMakeLists.txt
+++ b/fnet/src/vespa/fnet/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(fnet
     SOURCES
     channel.cpp
diff --git a/fnet/src/vespa/fnet/channel.cpp b/fnet/src/vespa/fnet/channel.cpp
index 81b57218b73..32a84ad966b 100644
--- a/fnet/src/vespa/fnet/channel.cpp
+++ b/fnet/src/vespa/fnet/channel.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "channel.h"
 #include "connection.h"
diff --git a/fnet/src/vespa/fnet/channel.h b/fnet/src/vespa/fnet/channel.h
index f9ce9d249a5..ced0d8632b0 100644
--- a/fnet/src/vespa/fnet/channel.h
+++ b/fnet/src/vespa/fnet/channel.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/channellookup.cpp b/fnet/src/vespa/fnet/channellookup.cpp
index a5f67fec35b..fa2672fec37 100644
--- a/fnet/src/vespa/fnet/channellookup.cpp
+++ b/fnet/src/vespa/fnet/channellookup.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "channellookup.h"
 #include "vespa/fnet/channel.h"
diff --git a/fnet/src/vespa/fnet/channellookup.h b/fnet/src/vespa/fnet/channellookup.h
index 7700a4f927a..52365a89e5f 100644
--- a/fnet/src/vespa/fnet/channellookup.h
+++ b/fnet/src/vespa/fnet/channellookup.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/config.cpp b/fnet/src/vespa/fnet/config.cpp
index b2488e0eee0..ab43316fc9d 100644
--- a/fnet/src/vespa/fnet/config.cpp
+++ b/fnet/src/vespa/fnet/config.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "config.h"
 
diff --git a/fnet/src/vespa/fnet/config.h b/fnet/src/vespa/fnet/config.h
index ea9f8f740df..e92540ce0bc 100644
--- a/fnet/src/vespa/fnet/config.h
+++ b/fnet/src/vespa/fnet/config.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/connection.cpp b/fnet/src/vespa/fnet/connection.cpp
index a3208503bb9..f1ed051bdc1 100644
--- a/fnet/src/vespa/fnet/connection.cpp
+++ b/fnet/src/vespa/fnet/connection.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "connection.h"
 #include "dummypacket.h"
diff --git a/fnet/src/vespa/fnet/connection.h b/fnet/src/vespa/fnet/connection.h
index 3e37bcd583b..511d50a451e 100644
--- a/fnet/src/vespa/fnet/connection.h
+++ b/fnet/src/vespa/fnet/connection.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/connector.cpp b/fnet/src/vespa/fnet/connector.cpp
index 1372b5dc6ba..552e958570a 100644
--- a/fnet/src/vespa/fnet/connector.cpp
+++ b/fnet/src/vespa/fnet/connector.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "connector.h"
 #include "transport_thread.h"
diff --git a/fnet/src/vespa/fnet/connector.h b/fnet/src/vespa/fnet/connector.h
index 3ca2cd8cd5a..8f0fc0b1d81 100644
--- a/fnet/src/vespa/fnet/connector.h
+++ b/fnet/src/vespa/fnet/connector.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/context.cpp b/fnet/src/vespa/fnet/context.cpp
index 24456466c04..33c0653182f 100644
--- a/fnet/src/vespa/fnet/context.cpp
+++ b/fnet/src/vespa/fnet/context.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "context.h"
 #include <cstdio>
diff --git a/fnet/src/vespa/fnet/context.h b/fnet/src/vespa/fnet/context.h
index e06d3edfd6c..7bdaa20db0f 100644
--- a/fnet/src/vespa/fnet/context.h
+++ b/fnet/src/vespa/fnet/context.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/controlpacket.cpp b/fnet/src/vespa/fnet/controlpacket.cpp
index 51334778d3d..53c23f444ab 100644
--- a/fnet/src/vespa/fnet/controlpacket.cpp
+++ b/fnet/src/vespa/fnet/controlpacket.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "controlpacket.h"
 #include "context.h"
diff --git a/fnet/src/vespa/fnet/controlpacket.h b/fnet/src/vespa/fnet/controlpacket.h
index f48bcaabfc2..5e6eb8a564b 100644
--- a/fnet/src/vespa/fnet/controlpacket.h
+++ b/fnet/src/vespa/fnet/controlpacket.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/databuffer.cpp b/fnet/src/vespa/fnet/databuffer.cpp
index 202570ecb2e..3b2e7759c99 100644
--- a/fnet/src/vespa/fnet/databuffer.cpp
+++ b/fnet/src/vespa/fnet/databuffer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "databuffer.h"
 
diff --git a/fnet/src/vespa/fnet/databuffer.h b/fnet/src/vespa/fnet/databuffer.h
index 8639a8ba06b..9cc8ce15edf 100644
--- a/fnet/src/vespa/fnet/databuffer.h
+++ b/fnet/src/vespa/fnet/databuffer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/dummypacket.cpp b/fnet/src/vespa/fnet/dummypacket.cpp
index 0a26d71fe2a..9e7ce37236b 100644
--- a/fnet/src/vespa/fnet/dummypacket.cpp
+++ b/fnet/src/vespa/fnet/dummypacket.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "dummypacket.h"
 #include "context.h"
diff --git a/fnet/src/vespa/fnet/dummypacket.h b/fnet/src/vespa/fnet/dummypacket.h
index be0a932e77d..d14c1e4f022 100644
--- a/fnet/src/vespa/fnet/dummypacket.h
+++ b/fnet/src/vespa/fnet/dummypacket.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/ext_connectable.h b/fnet/src/vespa/fnet/ext_connectable.h
index 4b1c6e1629c..642f3dcfb59 100644
--- a/fnet/src/vespa/fnet/ext_connectable.h
+++ b/fnet/src/vespa/fnet/ext_connectable.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/fnet.h b/fnet/src/vespa/fnet/fnet.h
index 864bc831344..7b8404376d7 100644
--- a/fnet/src/vespa/fnet/fnet.h
+++ b/fnet/src/vespa/fnet/fnet.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/CMakeLists.txt b/fnet/src/vespa/fnet/frt/CMakeLists.txt
index 178a25f6f38..6aa42ec5568 100644
--- a/fnet/src/vespa/fnet/frt/CMakeLists.txt
+++ b/fnet/src/vespa/fnet/frt/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(fnet_frt OBJECT
     SOURCES
     error.cpp
diff --git a/fnet/src/vespa/fnet/frt/error.cpp b/fnet/src/vespa/fnet/frt/error.cpp
index 22bb619a67d..bab662056b6 100644
--- a/fnet/src/vespa/fnet/frt/error.cpp
+++ b/fnet/src/vespa/fnet/frt/error.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "error.h"
 
diff --git a/fnet/src/vespa/fnet/frt/error.h b/fnet/src/vespa/fnet/frt/error.h
index 0162c00d249..e3554796cc8 100644
--- a/fnet/src/vespa/fnet/frt/error.h
+++ b/fnet/src/vespa/fnet/frt/error.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/frt.h b/fnet/src/vespa/fnet/frt/frt.h
index 7a5d2700282..490b9b0a2b1 100644
--- a/fnet/src/vespa/fnet/frt/frt.h
+++ b/fnet/src/vespa/fnet/frt/frt.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/invokable.h b/fnet/src/vespa/fnet/frt/invokable.h
index 15ac8691c7a..48e6aefe776 100644
--- a/fnet/src/vespa/fnet/frt/invokable.h
+++ b/fnet/src/vespa/fnet/frt/invokable.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/invoker.cpp b/fnet/src/vespa/fnet/frt/invoker.cpp
index a2f23f6aa36..0cb364935df 100644
--- a/fnet/src/vespa/fnet/frt/invoker.cpp
+++ b/fnet/src/vespa/fnet/frt/invoker.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "invoker.h"
 #include "supervisor.h"
diff --git a/fnet/src/vespa/fnet/frt/invoker.h b/fnet/src/vespa/fnet/frt/invoker.h
index 9955ca12240..7716430f842 100644
--- a/fnet/src/vespa/fnet/frt/invoker.h
+++ b/fnet/src/vespa/fnet/frt/invoker.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/isharedblob.h b/fnet/src/vespa/fnet/frt/isharedblob.h
index 084081a6816..ce262eeb7a9 100644
--- a/fnet/src/vespa/fnet/frt/isharedblob.h
+++ b/fnet/src/vespa/fnet/frt/isharedblob.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/packets.cpp b/fnet/src/vespa/fnet/frt/packets.cpp
index 5e74d2de052..e6c0cd95a48 100644
--- a/fnet/src/vespa/fnet/frt/packets.cpp
+++ b/fnet/src/vespa/fnet/frt/packets.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "packets.h"
 #include "rpcrequest.h"
diff --git a/fnet/src/vespa/fnet/frt/packets.h b/fnet/src/vespa/fnet/frt/packets.h
index 58b1e1f30e3..a6d14d64cd9 100644
--- a/fnet/src/vespa/fnet/frt/packets.h
+++ b/fnet/src/vespa/fnet/frt/packets.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/reflection.cpp b/fnet/src/vespa/fnet/frt/reflection.cpp
index 8bfa4507cd2..4285c512ebf 100644
--- a/fnet/src/vespa/fnet/frt/reflection.cpp
+++ b/fnet/src/vespa/fnet/frt/reflection.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "reflection.h"
 #include "values.h"
diff --git a/fnet/src/vespa/fnet/frt/reflection.h b/fnet/src/vespa/fnet/frt/reflection.h
index fc64b6a69e7..466e58413e9 100644
--- a/fnet/src/vespa/fnet/frt/reflection.h
+++ b/fnet/src/vespa/fnet/frt/reflection.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/rpcrequest.cpp b/fnet/src/vespa/fnet/frt/rpcrequest.cpp
index 0232887724b..6243f405639 100644
--- a/fnet/src/vespa/fnet/frt/rpcrequest.cpp
+++ b/fnet/src/vespa/fnet/frt/rpcrequest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "rpcrequest.h"
 #include "packets.h"
diff --git a/fnet/src/vespa/fnet/frt/rpcrequest.h b/fnet/src/vespa/fnet/frt/rpcrequest.h
index a834606d92e..1b636bd9607 100644
--- a/fnet/src/vespa/fnet/frt/rpcrequest.h
+++ b/fnet/src/vespa/fnet/frt/rpcrequest.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/supervisor.cpp b/fnet/src/vespa/fnet/frt/supervisor.cpp
index e631402b791..0d2a9b68f17 100644
--- a/fnet/src/vespa/fnet/frt/supervisor.cpp
+++ b/fnet/src/vespa/fnet/frt/supervisor.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "supervisor.h"
 #include "invoker.h"
diff --git a/fnet/src/vespa/fnet/frt/supervisor.h b/fnet/src/vespa/fnet/frt/supervisor.h
index dab0e236a35..e818e506186 100644
--- a/fnet/src/vespa/fnet/frt/supervisor.h
+++ b/fnet/src/vespa/fnet/frt/supervisor.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/target.cpp b/fnet/src/vespa/fnet/frt/target.cpp
index 11e8515719e..02dd4c68191 100644
--- a/fnet/src/vespa/fnet/frt/target.cpp
+++ b/fnet/src/vespa/fnet/frt/target.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "target.h"
 #include "supervisor.h"
@@ -27,4 +27,4 @@ FRT_Target::InvokeVoid(FRT_RPCRequest *req) {
 void
 FRT_Target::InvokeSync(FRT_RPCRequest *req, double timeout) {
     FRT_Supervisor::InvokeSync(_scheduler, _conn, req, timeout);
-}
-\ No newline at end of file
+}
diff --git a/fnet/src/vespa/fnet/frt/target.h b/fnet/src/vespa/fnet/frt/target.h
index 3b659d0505b..d8a2eaafa76 100644
--- a/fnet/src/vespa/fnet/frt/target.h
+++ b/fnet/src/vespa/fnet/frt/target.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/frt/values.cpp b/fnet/src/vespa/fnet/frt/values.cpp
index aca468bc630..75661b4983b 100644
--- a/fnet/src/vespa/fnet/frt/values.cpp
+++ b/fnet/src/vespa/fnet/frt/values.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "values.h"
 #include <vespa/fnet/databuffer.h>
diff --git a/fnet/src/vespa/fnet/frt/values.h b/fnet/src/vespa/fnet/frt/values.h
index 8821eb65f4b..0b81a9f9f47 100644
--- a/fnet/src/vespa/fnet/frt/values.h
+++ b/fnet/src/vespa/fnet/frt/values.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/iexecutable.h b/fnet/src/vespa/fnet/iexecutable.h
index d4a8ebdbb70..4bcd3aaa72f 100644
--- a/fnet/src/vespa/fnet/iexecutable.h
+++ b/fnet/src/vespa/fnet/iexecutable.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/info.cpp b/fnet/src/vespa/fnet/info.cpp
index 7b75a5f404b..e652c240a6c 100644
--- a/fnet/src/vespa/fnet/info.cpp
+++ b/fnet/src/vespa/fnet/info.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "info.h"
 #include <vespa/vespalib/component/vtag.h>
diff --git a/fnet/src/vespa/fnet/info.h b/fnet/src/vespa/fnet/info.h
index abb1d3583f5..6285c083ff1 100644
--- a/fnet/src/vespa/fnet/info.h
+++ b/fnet/src/vespa/fnet/info.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/iocomponent.cpp b/fnet/src/vespa/fnet/iocomponent.cpp
index 80122b3352f..a3c3911db54 100644
--- a/fnet/src/vespa/fnet/iocomponent.cpp
+++ b/fnet/src/vespa/fnet/iocomponent.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "iocomponent.h"
 #include "transport_thread.h"
diff --git a/fnet/src/vespa/fnet/iocomponent.h b/fnet/src/vespa/fnet/iocomponent.h
index 7e17f5679de..2e9bcb9fc0e 100644
--- a/fnet/src/vespa/fnet/iocomponent.h
+++ b/fnet/src/vespa/fnet/iocomponent.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/ipacketfactory.h b/fnet/src/vespa/fnet/ipacketfactory.h
index 82881b67fb6..f9095a4a90a 100644
--- a/fnet/src/vespa/fnet/ipacketfactory.h
+++ b/fnet/src/vespa/fnet/ipacketfactory.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/ipackethandler.h b/fnet/src/vespa/fnet/ipackethandler.h
index 7042b092b51..90d7540516d 100644
--- a/fnet/src/vespa/fnet/ipackethandler.h
+++ b/fnet/src/vespa/fnet/ipackethandler.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/ipacketstreamer.h b/fnet/src/vespa/fnet/ipacketstreamer.h
index ad31506dc37..d70245221f9 100644
--- a/fnet/src/vespa/fnet/ipacketstreamer.h
+++ b/fnet/src/vespa/fnet/ipacketstreamer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/iserveradapter.h b/fnet/src/vespa/fnet/iserveradapter.h
index 3de01251392..6ce9247f993 100644
--- a/fnet/src/vespa/fnet/iserveradapter.h
+++ b/fnet/src/vespa/fnet/iserveradapter.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/packet.cpp b/fnet/src/vespa/fnet/packet.cpp
index 85172841822..15bb9bbb0b3 100644
--- a/fnet/src/vespa/fnet/packet.cpp
+++ b/fnet/src/vespa/fnet/packet.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "packet.h"
 #include <vespa/vespalib/util/stringfmt.h>
diff --git a/fnet/src/vespa/fnet/packet.h b/fnet/src/vespa/fnet/packet.h
index 0dea973ab9a..bd0119628c6 100644
--- a/fnet/src/vespa/fnet/packet.h
+++ b/fnet/src/vespa/fnet/packet.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/packetqueue.cpp b/fnet/src/vespa/fnet/packetqueue.cpp
index 795410c1105..df1938beb8e 100644
--- a/fnet/src/vespa/fnet/packetqueue.cpp
+++ b/fnet/src/vespa/fnet/packetqueue.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "packetqueue.h"
 #include "packet.h"
diff --git a/fnet/src/vespa/fnet/packetqueue.h b/fnet/src/vespa/fnet/packetqueue.h
index 3e2623540fb..099410ed385 100644
--- a/fnet/src/vespa/fnet/packetqueue.h
+++ b/fnet/src/vespa/fnet/packetqueue.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/scheduler.cpp b/fnet/src/vespa/fnet/scheduler.cpp
index dd7a3246090..6e0fc3b8255 100644
--- a/fnet/src/vespa/fnet/scheduler.cpp
+++ b/fnet/src/vespa/fnet/scheduler.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "scheduler.h"
 #include "task.h"
@@ -277,4 +277,4 @@ FNET_Scheduler::PerformTasks(uint32_t slot, uint32_t iter) {
 
 bool FNET_Scheduler::IsActive(FNET_Task *task) {
     return task->_task_next != nullptr;
-}
-\ No newline at end of file
+}
diff --git a/fnet/src/vespa/fnet/scheduler.h b/fnet/src/vespa/fnet/scheduler.h
index c913f3bc4f2..68238fdbedc 100644
--- a/fnet/src/vespa/fnet/scheduler.h
+++ b/fnet/src/vespa/fnet/scheduler.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/signalshutdown.cpp b/fnet/src/vespa/fnet/signalshutdown.cpp
index 480635f72a8..bcd97283738 100644
--- a/fnet/src/vespa/fnet/signalshutdown.cpp
+++ b/fnet/src/vespa/fnet/signalshutdown.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "signalshutdown.h"
 #include "transport.h"
diff --git a/fnet/src/vespa/fnet/signalshutdown.h b/fnet/src/vespa/fnet/signalshutdown.h
index ba5e5a5bb29..d09733934db 100644
--- a/fnet/src/vespa/fnet/signalshutdown.h
+++ b/fnet/src/vespa/fnet/signalshutdown.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/simplepacketstreamer.cpp b/fnet/src/vespa/fnet/simplepacketstreamer.cpp
index b3d04ce170c..b26d467e78e 100644
--- a/fnet/src/vespa/fnet/simplepacketstreamer.cpp
+++ b/fnet/src/vespa/fnet/simplepacketstreamer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "simplepacketstreamer.h"
 #include "databuffer.h"
diff --git a/fnet/src/vespa/fnet/simplepacketstreamer.h b/fnet/src/vespa/fnet/simplepacketstreamer.h
index 57b96900791..8aa21c47790 100644
--- a/fnet/src/vespa/fnet/simplepacketstreamer.h
+++ b/fnet/src/vespa/fnet/simplepacketstreamer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/stats.cpp b/fnet/src/vespa/fnet/stats.cpp
index 10ae36f1ffb..f156fe4afe7 100644
--- a/fnet/src/vespa/fnet/stats.cpp
+++ b/fnet/src/vespa/fnet/stats.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "stats.h"
 
diff --git a/fnet/src/vespa/fnet/stats.h b/fnet/src/vespa/fnet/stats.h
index f72af4e979c..76651393165 100644
--- a/fnet/src/vespa/fnet/stats.h
+++ b/fnet/src/vespa/fnet/stats.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/task.cpp b/fnet/src/vespa/fnet/task.cpp
index 1e3baef5e73..0888cba6582 100644
--- a/fnet/src/vespa/fnet/task.cpp
+++ b/fnet/src/vespa/fnet/task.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "task.h"
 #include "scheduler.h"
diff --git a/fnet/src/vespa/fnet/task.h b/fnet/src/vespa/fnet/task.h
index b27d1272b1f..8529795c6ae 100644
--- a/fnet/src/vespa/fnet/task.h
+++ b/fnet/src/vespa/fnet/task.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/transport.cpp b/fnet/src/vespa/fnet/transport.cpp
index 067016872e3..4177d80706d 100644
--- a/fnet/src/vespa/fnet/transport.cpp
+++ b/fnet/src/vespa/fnet/transport.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "transport.h"
 #include "transport_thread.h"
diff --git a/fnet/src/vespa/fnet/transport.h b/fnet/src/vespa/fnet/transport.h
index c0d9a86c08e..87dc54ddb86 100644
--- a/fnet/src/vespa/fnet/transport.h
+++ b/fnet/src/vespa/fnet/transport.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fnet/src/vespa/fnet/transport_thread.cpp b/fnet/src/vespa/fnet/transport_thread.cpp
index 1eed64b7e85..ddeb6dfa93d 100644
--- a/fnet/src/vespa/fnet/transport_thread.cpp
+++ b/fnet/src/vespa/fnet/transport_thread.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "transport_thread.h"
 #include "iexecutable.h"
diff --git a/fnet/src/vespa/fnet/transport_thread.h b/fnet/src/vespa/fnet/transport_thread.h
index 72402aa9e10..6ec29968980 100644
--- a/fnet/src/vespa/fnet/transport_thread.h
+++ b/fnet/src/vespa/fnet/transport_thread.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
author	Jon Bratseth <bratseth@yahoo-inc.com>	2017-06-13 18:43:39 +0200
committer	Jon Bratseth <bratseth@yahoo-inc.com>	2017-06-13 18:43:39 +0200
commit	4e5d87a9baa4176a1089f7afd1f433a8da275725 (patch)
tree	23f2b54901b81b5c56dbf4a8c064658985962ead /fnet
parent	76221b9e73ad7a76a8179663e638b545a470c325 (diff)