Repository: trafficserver Updated Branches: refs/heads/master 8abc04d13 -> 8b1467e49
Move NOTICE to the one place where it belongs Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8b1467e4 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8b1467e4 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8b1467e4 Branch: refs/heads/master Commit: 8b1467e4941ce6f9e781bfafbec229c983be032a Parents: a5611f1 Author: Leif Hedstrom <[email protected]> Authored: Wed Aug 6 08:01:28 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Wed Aug 6 08:02:43 2014 -0600 ---------------------------------------------------------------------- NOTICE | 8 +++++++- plugins/experimental/healthchecks/healthchecks.c | 2 -- plugins/experimental/memcached_remap/NOTICE | 5 ----- 3 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b1467e4/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index f8b7974..83d5a1c 100644 --- a/NOTICE +++ b/NOTICE @@ -73,4 +73,10 @@ Copyright (C) 2012 Google Inc. ~~~ collapsed_collapsing: Plugin for connection collapsing to origin -Copyright (c) 2014 Yahoo! Inc. All rights reserved. +Copyright (C) 2014 Yahoo! Inc. All rights reserved. + +~~~ + +healthchecks: Plugin for ATS healthchecks. +Copyright (C) 2012 Go Daddy Operating Company, LLC + http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b1467e4/plugins/experimental/healthchecks/healthchecks.c ---------------------------------------------------------------------- diff --git a/plugins/experimental/healthchecks/healthchecks.c b/plugins/experimental/healthchecks/healthchecks.c index 3e442f0..12b7086 100644 --- a/plugins/experimental/healthchecks/healthchecks.c +++ b/plugins/experimental/healthchecks/healthchecks.c @@ -4,8 +4,6 @@ This is an origin server / intercept plugin, which implements flexible health ch @section license -Copyright 2012 Go Daddy Operating Company, LLC - Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b1467e4/plugins/experimental/memcached_remap/NOTICE ---------------------------------------------------------------------- diff --git a/plugins/experimental/memcached_remap/NOTICE b/plugins/experimental/memcached_remap/NOTICE deleted file mode 100644 index c19f064..0000000 --- a/plugins/experimental/memcached_remap/NOTICE +++ /dev/null @@ -1,5 +0,0 @@ -Apache Traffic Server -Copyright 2010 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/).
