From: Nicholas Ormrod <njormrod@fb.com>
Date: Tue, 4 Nov 2014 00:18:41 +0000 (-0800)
Subject: Fix licenses
X-Git-Tag: v0.22.0~198
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1bd2c00562e1193c91bff08852cfab7e3aaa2732;p=folly.git

Fix licenses

Summary:
There are two types of licenses used in folly, only one of
which is accepted by the linter.

This diff changes the license notices in pre-existing folly files!
Many folly/io/async/* files have the second type of license, but
without a Copyright notice. I have added copyright notices to these
files.

I have also added a compliant notice to
folly/test/function_benchmark/benchmark_impl.h, which was the sole file
in folly/test/function_benchmark/ that didn't have a standard license.

Test Plan:
The changes to folly are comment only.

Run all of folly against the linter, see no more license errors.

Reviewed By: davejwatson@fb.com

Subscribers: trunkagent, sdwilsh, njormrod, folly-diffs@, sjenkins

FB internal diff: D1648489

Tasks: 5486739

Signature: t1:1648489:1415035522:3d8bd9611eb7c7117b70d5e7f68de5768639a727
---

diff --git a/folly/io/async/AsyncTimeout.cpp b/folly/io/async/AsyncTimeout.cpp
index 4119e35b..1bd5a831 100644
--- a/folly/io/async/AsyncTimeout.cpp
+++ b/folly/io/async/AsyncTimeout.cpp
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2014 Facebook, Inc.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
diff --git a/folly/io/async/AsyncTimeout.h b/folly/io/async/AsyncTimeout.h
index 1385c5d2..86e91cf0 100644
--- a/folly/io/async/AsyncTimeout.h
+++ b/folly/io/async/AsyncTimeout.h
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2014 Facebook, Inc.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
diff --git a/folly/io/async/EventHandler.cpp b/folly/io/async/EventHandler.cpp
index 77b09d14..88604200 100644
--- a/folly/io/async/EventHandler.cpp
+++ b/folly/io/async/EventHandler.cpp
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2014 Facebook, Inc.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
diff --git a/folly/io/async/EventHandler.h b/folly/io/async/EventHandler.h
index 31abc7ee..798b00b7 100644
--- a/folly/io/async/EventHandler.h
+++ b/folly/io/async/EventHandler.h
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2014 Facebook, Inc.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
diff --git a/folly/io/async/EventUtil.h b/folly/io/async/EventUtil.h
index 2942f97a..26653bcf 100644
--- a/folly/io/async/EventUtil.h
+++ b/folly/io/async/EventUtil.h
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2014 Facebook, Inc.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
diff --git a/folly/io/async/HHWheelTimer.cpp b/folly/io/async/HHWheelTimer.cpp
index 587a2710..761d4fd2 100644
--- a/folly/io/async/HHWheelTimer.cpp
+++ b/folly/io/async/HHWheelTimer.cpp
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2014 Facebook, Inc.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
diff --git a/folly/io/async/Request.cpp b/folly/io/async/Request.cpp
index 3ea9fd5a..0f7d2ec3 100644
--- a/folly/io/async/Request.cpp
+++ b/folly/io/async/Request.cpp
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2014 Facebook, Inc.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
diff --git a/folly/io/async/Request.h b/folly/io/async/Request.h
index 85459fb4..9d1ff119 100644
--- a/folly/io/async/Request.h
+++ b/folly/io/async/Request.h
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2014 Facebook, Inc.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
diff --git a/folly/io/async/TimeoutManager.h b/folly/io/async/TimeoutManager.h
index e54ef20f..fb3a1b0e 100644
--- a/folly/io/async/TimeoutManager.h
+++ b/folly/io/async/TimeoutManager.h
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2014 Facebook, Inc.
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
diff --git a/folly/test/function_benchmark/benchmark_impl.h b/folly/test/function_benchmark/benchmark_impl.h
index b6eb40ce..bb97872b 100644
--- a/folly/test/function_benchmark/benchmark_impl.h
+++ b/folly/test/function_benchmark/benchmark_impl.h
@@ -1,4 +1,18 @@
-// Copyright 2004-present Facebook.  All rights reserved.
+/*
+ * Copyright 2014 Facebook, Inc.
+ *
+ * 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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #ifndef BENCHMARK_IMPL_H_
 #define BENCHMARK_IMPL_H_