diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-06-13 20:46:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-13 20:46:46 +0200 |
commit | a9785bfd7b01ddc83ac4b6d8d6a0e9f3222b21d4 (patch) | |
tree | adac15bff93c68cab36a260227aef3045e17901a /juniper | |
parent | 4ae60e3fbc20e0397662c39848cab012ff052e5e (diff) |
Revert "Copyright header"
Diffstat (limited to 'juniper')
84 files changed, 83 insertions, 85 deletions
diff --git a/juniper/CMakeLists.txt b/juniper/CMakeLists.txt index 5f6296367f0..f60405fedce 100644 --- a/juniper/CMakeLists.txt +++ b/juniper/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_define_module( DEPENDS fastos diff --git a/juniper/build/buildspec.xml b/juniper/build/buildspec.xml index 335140f192f..1252957dd97 100644 --- a/juniper/build/buildspec.xml +++ b/juniper/build/buildspec.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <BuildSpecification> <Dependencies os="all" arch="all"> <dep package="common/fastos" version="1.5.99.2"> diff --git a/juniper/doc/written/fsearchparams.html b/juniper/doc/written/fsearchparams.html index 790d064480c..b95ba895503 100644 --- a/juniper/doc/written/fsearchparams.html +++ b/juniper/doc/written/fsearchparams.html @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <title>Juniper Configuration Documentation</title> <h1>Juniper Configuration Documentation</h1> diff --git a/juniper/src/Doxyfile b/juniper/src/Doxyfile index 1aaf2b9499e..99f89d421d4 100644 --- a/juniper/src/Doxyfile +++ b/juniper/src/Doxyfile @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Doxyfile 1.2.14 # This file describes the settings to be used by the documentation system diff --git a/juniper/src/rpclient/testclient.rc b/juniper/src/rpclient/testclient.rc index 0c4177a759d..deaacabaec2 100644 --- a/juniper/src/rpclient/testclient.rc +++ b/juniper/src/rpclient/testclient.rc @@ -1,4 +1,3 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ## Dynamic teasers ## Some sensible default values ## This file is used by the testclient application by default, diff --git a/juniper/src/test/CMakeLists.txt b/juniper/src/test/CMakeLists.txt index de12252d49e..4fa338046b6 100644 --- a/juniper/src/test/CMakeLists.txt +++ b/juniper/src/test/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_executable(juniper_mcandTest_app TEST SOURCES mcandTest.cpp diff --git a/juniper/src/test/SrcTestSuite.cpp b/juniper/src/test/SrcTestSuite.cpp index 857bd958547..4a648e6af19 100644 --- a/juniper/src/test/SrcTestSuite.cpp +++ b/juniper/src/test/SrcTestSuite.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "testenv.h" #include "mcandTest.h" diff --git a/juniper/src/test/appender_test.cpp b/juniper/src/test/appender_test.cpp index bf790c38ee2..32a58a16bb0 100644 --- a/juniper/src/test/appender_test.cpp +++ b/juniper/src/test/appender_test.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/testapp.h> #define _NEED_SUMMARY_CONFIG_IMPL diff --git a/juniper/src/test/auxTest.cpp b/juniper/src/test/auxTest.cpp index 7a0856dfabb..349792ed723 100644 --- a/juniper/src/test/auxTest.cpp +++ b/juniper/src/test/auxTest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "auxTest.h" #include <vespa/fastos/file.h> diff --git a/juniper/src/test/auxTest.h b/juniper/src/test/auxTest.h index 6d7611c2c6a..a98adc732f4 100644 --- a/juniper/src/test/auxTest.h +++ b/juniper/src/test/auxTest.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once // Auxiliary tests for juniper - based on Juniper 1.x proximitytest.cpp diff --git a/juniper/src/test/auxTestApp.cpp b/juniper/src/test/auxTestApp.cpp index a17aca8aad0..a9475998aa4 100644 --- a/juniper/src/test/auxTestApp.cpp +++ b/juniper/src/test/auxTestApp.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "auxTest.h" #include <vespa/vespalib/testkit/testapp.h> diff --git a/juniper/src/test/fakerewriter.cpp b/juniper/src/test/fakerewriter.cpp index 9ded9d1c753..962f3d0e2f9 100644 --- a/juniper/src/test/fakerewriter.cpp +++ b/juniper/src/test/fakerewriter.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "fakerewriter.h" #include <vespa/vespalib/util/stringfmt.h> diff --git a/juniper/src/test/fakerewriter.h b/juniper/src/test/fakerewriter.h index 67474523eac..cf78fd28255 100644 --- a/juniper/src/test/fakerewriter.h +++ b/juniper/src/test/fakerewriter.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <vespa/juniper/rewriter.h> diff --git a/juniper/src/test/matchobjectTest.cpp b/juniper/src/test/matchobjectTest.cpp index a0e96a3ca2f..32f249ae720 100644 --- a/juniper/src/test/matchobjectTest.cpp +++ b/juniper/src/test/matchobjectTest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Implementation of the automated unit test class for the MatchObject * class. diff --git a/juniper/src/test/matchobjectTest.h b/juniper/src/test/matchobjectTest.h index d7cad8f445d..0f4a1ace55b 100644 --- a/juniper/src/test/matchobjectTest.h +++ b/juniper/src/test/matchobjectTest.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Definition of the automated unit test class for the MatchObject class. * diff --git a/juniper/src/test/matchobjectTestApp.cpp b/juniper/src/test/matchobjectTestApp.cpp index 5ed6b2b840d..f755c3e932a 100644 --- a/juniper/src/test/matchobjectTestApp.cpp +++ b/juniper/src/test/matchobjectTestApp.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "matchobjectTest.h" #include "testenv.h" diff --git a/juniper/src/test/mcandTest.cpp b/juniper/src/test/mcandTest.cpp index c82f4bc44b8..7f7d7d42100 100644 --- a/juniper/src/test/mcandTest.cpp +++ b/juniper/src/test/mcandTest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Implementation of the automated unit test class for the MatchCandidate * class. diff --git a/juniper/src/test/mcandTest.h b/juniper/src/test/mcandTest.h index 4341b670346..3fc32ee9f5d 100644 --- a/juniper/src/test/mcandTest.h +++ b/juniper/src/test/mcandTest.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Definition of the automated unit test class for the MatchCandidate * class. diff --git a/juniper/src/test/mcandTestApp.cpp b/juniper/src/test/mcandTestApp.cpp index 49688bbd5cf..cb33e503bb5 100644 --- a/juniper/src/test/mcandTestApp.cpp +++ b/juniper/src/test/mcandTestApp.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "mcandTest.h" #include <vespa/vespalib/testkit/testapp.h> diff --git a/juniper/src/test/queryparserTest.cpp b/juniper/src/test/queryparserTest.cpp index feffb5b9fa9..6f1065f279c 100644 --- a/juniper/src/test/queryparserTest.cpp +++ b/juniper/src/test/queryparserTest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Implementation of the automated unit test class for the QueryParser * class. diff --git a/juniper/src/test/queryparserTest.h b/juniper/src/test/queryparserTest.h index a1eeb4d2a46..d868fca659e 100644 --- a/juniper/src/test/queryparserTest.h +++ b/juniper/src/test/queryparserTest.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Definition of the automated unit test class for the QueryParser class. * diff --git a/juniper/src/test/queryparserTestApp.cpp b/juniper/src/test/queryparserTestApp.cpp index e9c50a42eca..7b3151a2314 100644 --- a/juniper/src/test/queryparserTestApp.cpp +++ b/juniper/src/test/queryparserTestApp.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "queryparserTest.h" #include "testenv.h" diff --git a/juniper/src/test/queryvisitor_test.cpp b/juniper/src/test/queryvisitor_test.cpp index ccb9603e645..612336ae78b 100644 --- a/juniper/src/test/queryvisitor_test.cpp +++ b/juniper/src/test/queryvisitor_test.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <memory> #include <vespa/vespalib/testkit/testapp.h> diff --git a/juniper/src/test/testenv.cpp b/juniper/src/test/testenv.cpp index 2a83df13487..ff4331148d3 100644 --- a/juniper/src/test/testenv.cpp +++ b/juniper/src/test/testenv.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* Setup and parameter parsing for static Juniper environment to reuse * within test framework */ diff --git a/juniper/src/test/testenv.h b/juniper/src/test/testenv.h index aa1eea0a3d1..cc126f3f3a5 100644 --- a/juniper/src/test/testenv.h +++ b/juniper/src/test/testenv.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once /* Include most of the stuff that we might need */ diff --git a/juniper/src/testproject.el b/juniper/src/testproject.el index ff722b36827..56cc68fe61d 100644 --- a/juniper/src/testproject.el +++ b/juniper/src/testproject.el @@ -1,4 +1,3 @@ -;; Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ;; testproject.el ;; Local configurations for the cpptest Emacs unit-test @@ -7,7 +6,7 @@ ;; the class(es) you want to test. ;; $Revision: 1.2 $ $Date: 2003-02-27 12:32:24 $ -;; Author: Nils Sand�y <nils.sandoy@fast.no> +;; Author: Nils Sandøy <nils.sandoy@fast.no> ;; Just a message to show that this file is beeing read. Look for this ;; in the *Messages* buffer. diff --git a/juniper/src/vespa/juniper/CMakeLists.txt b/juniper/src/vespa/juniper/CMakeLists.txt index ef9b9dc25eb..97cc8e3a1cc 100644 --- a/juniper/src/vespa/juniper/CMakeLists.txt +++ b/juniper/src/vespa/juniper/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(juniper SOURCES Matcher.cpp diff --git a/juniper/src/vespa/juniper/IJuniperProperties.h b/juniper/src/vespa/juniper/IJuniperProperties.h index 519580b1e4f..7f5727b3b88 100644 --- a/juniper/src/vespa/juniper/IJuniperProperties.h +++ b/juniper/src/vespa/juniper/IJuniperProperties.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/juniper/src/vespa/juniper/ITokenProcessor.h b/juniper/src/vespa/juniper/ITokenProcessor.h index 184db76bdc6..ff357c78335 100644 --- a/juniper/src/vespa/juniper/ITokenProcessor.h +++ b/juniper/src/vespa/juniper/ITokenProcessor.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <vespa/fastlib/text/unicodeutil.h> diff --git a/juniper/src/vespa/juniper/Matcher.cpp b/juniper/src/vespa/juniper/Matcher.cpp index 9ec26195cb6..76460323f9b 100644 --- a/juniper/src/vespa/juniper/Matcher.cpp +++ b/juniper/src/vespa/juniper/Matcher.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <algorithm> #include <string> diff --git a/juniper/src/vespa/juniper/Matcher.h b/juniper/src/vespa/juniper/Matcher.h index 6bbb307b74c..233e1beeb3d 100644 --- a/juniper/src/vespa/juniper/Matcher.h +++ b/juniper/src/vespa/juniper/Matcher.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* $Id$ */ #pragma once diff --git a/juniper/src/vespa/juniper/SummaryConfig.cpp b/juniper/src/vespa/juniper/SummaryConfig.cpp index 93e151c3858..03e4747b772 100644 --- a/juniper/src/vespa/juniper/SummaryConfig.cpp +++ b/juniper/src/vespa/juniper/SummaryConfig.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #define _NEED_SUMMARY_CONFIG_IMPL 1 #include "SummaryConfig.h" diff --git a/juniper/src/vespa/juniper/SummaryConfig.h b/juniper/src/vespa/juniper/SummaryConfig.h index 77e7b77e004..f2c89f41d01 100644 --- a/juniper/src/vespa/juniper/SummaryConfig.h +++ b/juniper/src/vespa/juniper/SummaryConfig.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // #pragma once #include <string> diff --git a/juniper/src/vespa/juniper/appender.h b/juniper/src/vespa/juniper/appender.h index 39ea3a649fb..58bda1101e4 100644 --- a/juniper/src/vespa/juniper/appender.h +++ b/juniper/src/vespa/juniper/appender.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once /* $Id: */ diff --git a/juniper/src/vespa/juniper/charutil.h b/juniper/src/vespa/juniper/charutil.h index 8059b373a33..33d87707ee8 100644 --- a/juniper/src/vespa/juniper/charutil.h +++ b/juniper/src/vespa/juniper/charutil.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once namespace juniper diff --git a/juniper/src/vespa/juniper/config.cpp b/juniper/src/vespa/juniper/config.cpp index 7edbcb073dd..b52da1c738b 100644 --- a/juniper/src/vespa/juniper/config.cpp +++ b/juniper/src/vespa/juniper/config.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* $Id$ */ #include "config.h" diff --git a/juniper/src/vespa/juniper/config.h b/juniper/src/vespa/juniper/config.h index bd10f604276..f7586d187bb 100644 --- a/juniper/src/vespa/juniper/config.h +++ b/juniper/src/vespa/juniper/config.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "juniperparams.h" diff --git a/juniper/src/vespa/juniper/dpinterface.cpp b/juniper/src/vespa/juniper/dpinterface.cpp index f74e6f8de0b..1e96396edb8 100644 --- a/juniper/src/vespa/juniper/dpinterface.cpp +++ b/juniper/src/vespa/juniper/dpinterface.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* $Id$ */ #include "dpinterface.h" diff --git a/juniper/src/vespa/juniper/dpinterface.h b/juniper/src/vespa/juniper/dpinterface.h index 2b797e903b7..da0747e6eb8 100644 --- a/juniper/src/vespa/juniper/dpinterface.h +++ b/juniper/src/vespa/juniper/dpinterface.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/juniper/src/vespa/juniper/expcache.cpp b/juniper/src/vespa/juniper/expcache.cpp index 2493d5ee533..7982b28c8f9 100644 --- a/juniper/src/vespa/juniper/expcache.cpp +++ b/juniper/src/vespa/juniper/expcache.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "expcache.h" #include "matchobject.h" diff --git a/juniper/src/vespa/juniper/expcache.h b/juniper/src/vespa/juniper/expcache.h index 6939785914a..cc3384b36ed 100644 --- a/juniper/src/vespa/juniper/expcache.h +++ b/juniper/src/vespa/juniper/expcache.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "simplemap.h" diff --git a/juniper/src/vespa/juniper/foreach_utils.h b/juniper/src/vespa/juniper/foreach_utils.h index 4007d721a99..05d015890d9 100644 --- a/juniper/src/vespa/juniper/foreach_utils.h +++ b/juniper/src/vespa/juniper/foreach_utils.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <algorithm> diff --git a/juniper/src/vespa/juniper/hashbase.h b/juniper/src/vespa/juniper/hashbase.h index 0fe03514e48..f0f29238993 100644 --- a/juniper/src/vespa/juniper/hashbase.h +++ b/juniper/src/vespa/juniper/hashbase.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <stdio.h> diff --git a/juniper/src/vespa/juniper/juniperdebug.h b/juniper/src/vespa/juniper/juniperdebug.h index b54b229df18..7f60d988341 100644 --- a/juniper/src/vespa/juniper/juniperdebug.h +++ b/juniper/src/vespa/juniper/juniperdebug.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once // Include something from STL so that _STLPORT_VERSION gets defined if appropriate diff --git a/juniper/src/vespa/juniper/juniperparams.cpp b/juniper/src/vespa/juniper/juniperparams.cpp index a4952543123..ff5235d2494 100644 --- a/juniper/src/vespa/juniper/juniperparams.cpp +++ b/juniper/src/vespa/juniper/juniperparams.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "juniperdebug.h" #include "juniperparams.h" #include "Matcher.h" diff --git a/juniper/src/vespa/juniper/juniperparams.h b/juniper/src/vespa/juniper/juniperparams.h index 4ddb43d1325..d6fd0f46031 100644 --- a/juniper/src/vespa/juniper/juniperparams.h +++ b/juniper/src/vespa/juniper/juniperparams.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <string> diff --git a/juniper/src/vespa/juniper/keyocc.cpp b/juniper/src/vespa/juniper/keyocc.cpp index acdc8bf6617..861b42be745 100644 --- a/juniper/src/vespa/juniper/keyocc.cpp +++ b/juniper/src/vespa/juniper/keyocc.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "keyocc.h" key_occ::key_occ(const char* term_, off_t spos, off_t stoken, int len) : diff --git a/juniper/src/vespa/juniper/keyocc.h b/juniper/src/vespa/juniper/keyocc.h index fae4861d1ef..4e63f3f249a 100644 --- a/juniper/src/vespa/juniper/keyocc.h +++ b/juniper/src/vespa/juniper/keyocc.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "multiset.h" diff --git a/juniper/src/vespa/juniper/matchelem.cpp b/juniper/src/vespa/juniper/matchelem.cpp index 63367a5eeff..3db45393a7b 100644 --- a/juniper/src/vespa/juniper/matchelem.cpp +++ b/juniper/src/vespa/juniper/matchelem.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "matchelem.h" diff --git a/juniper/src/vespa/juniper/matchelem.h b/juniper/src/vespa/juniper/matchelem.h index 5da6b1b0e03..91cbb5e7d65 100644 --- a/juniper/src/vespa/juniper/matchelem.h +++ b/juniper/src/vespa/juniper/matchelem.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* $Id: */ #pragma once diff --git a/juniper/src/vespa/juniper/matchobject.cpp b/juniper/src/vespa/juniper/matchobject.cpp index 17092703903..86e7bd01bb0 100644 --- a/juniper/src/vespa/juniper/matchobject.cpp +++ b/juniper/src/vespa/juniper/matchobject.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "query.h" #include "matchobject.h" diff --git a/juniper/src/vespa/juniper/matchobject.h b/juniper/src/vespa/juniper/matchobject.h index 75d36aa361b..a97cb7cb6ab 100644 --- a/juniper/src/vespa/juniper/matchobject.h +++ b/juniper/src/vespa/juniper/matchobject.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "queryhandle.h" diff --git a/juniper/src/vespa/juniper/mcand.cpp b/juniper/src/vespa/juniper/mcand.cpp index a172c8931f4..d657bb020ba 100644 --- a/juniper/src/vespa/juniper/mcand.cpp +++ b/juniper/src/vespa/juniper/mcand.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "mcand.h" #include "Matcher.h" diff --git a/juniper/src/vespa/juniper/mcand.h b/juniper/src/vespa/juniper/mcand.h index 0928c55ddea..60fb5de542a 100644 --- a/juniper/src/vespa/juniper/mcand.h +++ b/juniper/src/vespa/juniper/mcand.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* $Id$ */ #pragma once diff --git a/juniper/src/vespa/juniper/multiset.h b/juniper/src/vespa/juniper/multiset.h index 5c4495080fe..a50509e1660 100644 --- a/juniper/src/vespa/juniper/multiset.h +++ b/juniper/src/vespa/juniper/multiset.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <algorithm> #include <vector> diff --git a/juniper/src/vespa/juniper/propreader.cpp b/juniper/src/vespa/juniper/propreader.cpp index e93e641eaed..117d5c09956 100644 --- a/juniper/src/vespa/juniper/propreader.cpp +++ b/juniper/src/vespa/juniper/propreader.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "propreader.h" #include <vespa/fastlib/io/bufferedfile.h> diff --git a/juniper/src/vespa/juniper/propreader.h b/juniper/src/vespa/juniper/propreader.h index 837b287fab8..33ba08bcef9 100644 --- a/juniper/src/vespa/juniper/propreader.h +++ b/juniper/src/vespa/juniper/propreader.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "IJuniperProperties.h" diff --git a/juniper/src/vespa/juniper/query.h b/juniper/src/vespa/juniper/query.h index 63a6a9e1a4a..9a6f37b3c0e 100644 --- a/juniper/src/vespa/juniper/query.h +++ b/juniper/src/vespa/juniper/query.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/juniper/src/vespa/juniper/queryhandle.cpp b/juniper/src/vespa/juniper/queryhandle.cpp index 9998695d871..497918ae1f1 100644 --- a/juniper/src/vespa/juniper/queryhandle.cpp +++ b/juniper/src/vespa/juniper/queryhandle.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "query.h" #include "queryhandle.h" diff --git a/juniper/src/vespa/juniper/queryhandle.h b/juniper/src/vespa/juniper/queryhandle.h index 76da4a31438..f7f04d9e06f 100644 --- a/juniper/src/vespa/juniper/queryhandle.h +++ b/juniper/src/vespa/juniper/queryhandle.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* $Id$ */ #pragma once diff --git a/juniper/src/vespa/juniper/querymodifier.cpp b/juniper/src/vespa/juniper/querymodifier.cpp index c938c3a43b6..e72404fe82f 100644 --- a/juniper/src/vespa/juniper/querymodifier.cpp +++ b/juniper/src/vespa/juniper/querymodifier.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "juniperdebug.h" #include "querymodifier.h" diff --git a/juniper/src/vespa/juniper/querymodifier.h b/juniper/src/vespa/juniper/querymodifier.h index f5798779854..0f28987be40 100644 --- a/juniper/src/vespa/juniper/querymodifier.h +++ b/juniper/src/vespa/juniper/querymodifier.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "simplemap.h" diff --git a/juniper/src/vespa/juniper/querynode.cpp b/juniper/src/vespa/juniper/querynode.cpp index 7bde92d7211..47bd5146432 100644 --- a/juniper/src/vespa/juniper/querynode.cpp +++ b/juniper/src/vespa/juniper/querynode.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "querynode.h" #include "queryvisitor.h" diff --git a/juniper/src/vespa/juniper/querynode.h b/juniper/src/vespa/juniper/querynode.h index cb4f4d5d8f9..63db1802624 100644 --- a/juniper/src/vespa/juniper/querynode.h +++ b/juniper/src/vespa/juniper/querynode.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* $Id$ */ #pragma once diff --git a/juniper/src/vespa/juniper/queryparser.cpp b/juniper/src/vespa/juniper/queryparser.cpp index 6214c7d09e5..4acc70dc8ab 100644 --- a/juniper/src/vespa/juniper/queryparser.cpp +++ b/juniper/src/vespa/juniper/queryparser.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // /* Simple prefix query parser for Juniper for debugging purposes */ diff --git a/juniper/src/vespa/juniper/queryparser.h b/juniper/src/vespa/juniper/queryparser.h index f61d6f19b6e..b9cd7ea0352 100644 --- a/juniper/src/vespa/juniper/queryparser.h +++ b/juniper/src/vespa/juniper/queryparser.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/juniper/src/vespa/juniper/queryvisitor.cpp b/juniper/src/vespa/juniper/queryvisitor.cpp index f8f8d2d3da7..21943b0615f 100644 --- a/juniper/src/vespa/juniper/queryvisitor.cpp +++ b/juniper/src/vespa/juniper/queryvisitor.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "query.h" #include "juniperdebug.h" diff --git a/juniper/src/vespa/juniper/queryvisitor.h b/juniper/src/vespa/juniper/queryvisitor.h index 2557e91021c..caedf31e3ef 100644 --- a/juniper/src/vespa/juniper/queryvisitor.h +++ b/juniper/src/vespa/juniper/queryvisitor.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "rpinterface.h" diff --git a/juniper/src/vespa/juniper/reducematcher.cpp b/juniper/src/vespa/juniper/reducematcher.cpp index dadc9dac40f..89d2bda8632 100644 --- a/juniper/src/vespa/juniper/reducematcher.cpp +++ b/juniper/src/vespa/juniper/reducematcher.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "juniperdebug.h" #include "reducematcher.h" diff --git a/juniper/src/vespa/juniper/reducematcher.h b/juniper/src/vespa/juniper/reducematcher.h index 09b26e70afb..cc50f6ec518 100644 --- a/juniper/src/vespa/juniper/reducematcher.h +++ b/juniper/src/vespa/juniper/reducematcher.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "rewriter.h" diff --git a/juniper/src/vespa/juniper/result.cpp b/juniper/src/vespa/juniper/result.cpp index 0d9e2c42dcb..7604de88ec4 100644 --- a/juniper/src/vespa/juniper/result.cpp +++ b/juniper/src/vespa/juniper/result.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #define _NEED_SUMMARY_CONFIG_IMPL 1 #include "SummaryConfig.h" diff --git a/juniper/src/vespa/juniper/result.h b/juniper/src/vespa/juniper/result.h index 755a368da7f..07e966acae3 100644 --- a/juniper/src/vespa/juniper/result.h +++ b/juniper/src/vespa/juniper/result.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "queryhandle.h" diff --git a/juniper/src/vespa/juniper/rewriter.h b/juniper/src/vespa/juniper/rewriter.h index 2a3cbbc479f..33c4e2b874c 100644 --- a/juniper/src/vespa/juniper/rewriter.h +++ b/juniper/src/vespa/juniper/rewriter.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* $Id$ */ #pragma once diff --git a/juniper/src/vespa/juniper/rpinterface.cpp b/juniper/src/vespa/juniper/rpinterface.cpp index 07e30fe9794..890481b4b94 100644 --- a/juniper/src/vespa/juniper/rpinterface.cpp +++ b/juniper/src/vespa/juniper/rpinterface.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "rpinterface.h" #include "juniperparams.h" diff --git a/juniper/src/vespa/juniper/rpinterface.h b/juniper/src/vespa/juniper/rpinterface.h index 027ebf90599..3c04df001ab 100644 --- a/juniper/src/vespa/juniper/rpinterface.h +++ b/juniper/src/vespa/juniper/rpinterface.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /* $Id$ */ #pragma once diff --git a/juniper/src/vespa/juniper/simplemap.h b/juniper/src/vespa/juniper/simplemap.h index 2880f7bf53c..dcaf3ac67dc 100644 --- a/juniper/src/vespa/juniper/simplemap.h +++ b/juniper/src/vespa/juniper/simplemap.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <map> diff --git a/juniper/src/vespa/juniper/specialtokenregistry.cpp b/juniper/src/vespa/juniper/specialtokenregistry.cpp index 418ada10d10..ecec7d90d29 100644 --- a/juniper/src/vespa/juniper/specialtokenregistry.cpp +++ b/juniper/src/vespa/juniper/specialtokenregistry.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "specialtokenregistry.h" diff --git a/juniper/src/vespa/juniper/specialtokenregistry.h b/juniper/src/vespa/juniper/specialtokenregistry.h index 36eca42476c..683a715f52d 100644 --- a/juniper/src/vespa/juniper/specialtokenregistry.h +++ b/juniper/src/vespa/juniper/specialtokenregistry.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/juniper/src/vespa/juniper/stringmap.cpp b/juniper/src/vespa/juniper/stringmap.cpp index 13d7bdee980..75106fc23f8 100644 --- a/juniper/src/vespa/juniper/stringmap.cpp +++ b/juniper/src/vespa/juniper/stringmap.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "stringmap.h" diff --git a/juniper/src/vespa/juniper/stringmap.h b/juniper/src/vespa/juniper/stringmap.h index c202ecb5888..b818513f1e0 100644 --- a/juniper/src/vespa/juniper/stringmap.h +++ b/juniper/src/vespa/juniper/stringmap.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <vespa/vespalib/stllike/hash_map.h> diff --git a/juniper/src/vespa/juniper/sumdesc.cpp b/juniper/src/vespa/juniper/sumdesc.cpp index 2e380658272..f6c92432d0b 100644 --- a/juniper/src/vespa/juniper/sumdesc.cpp +++ b/juniper/src/vespa/juniper/sumdesc.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "sumdesc.h" #include "juniperdebug.h" diff --git a/juniper/src/vespa/juniper/sumdesc.h b/juniper/src/vespa/juniper/sumdesc.h index 0af1f2d3cd2..2ad1574ea5a 100644 --- a/juniper/src/vespa/juniper/sumdesc.h +++ b/juniper/src/vespa/juniper/sumdesc.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once /* $Id$ */ diff --git a/juniper/src/vespa/juniper/tokenizer.cpp b/juniper/src/vespa/juniper/tokenizer.cpp index 6af15e8d55f..719f470189b 100644 --- a/juniper/src/vespa/juniper/tokenizer.cpp +++ b/juniper/src/vespa/juniper/tokenizer.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // #include "tokenizer.h" #include "juniperdebug.h" diff --git a/juniper/src/vespa/juniper/tokenizer.h b/juniper/src/vespa/juniper/tokenizer.h index fe0008f17f7..e5c6f3d139e 100644 --- a/juniper/src/vespa/juniper/tokenizer.h +++ b/juniper/src/vespa/juniper/tokenizer.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "specialtokenregistry.h" |