From aace46516bd0b72a05273246d0e97286bad26236 Mon Sep 17 00:00:00 2001 From: Sagar Vemuri Date: Fri, 28 Jul 2017 13:55:19 -0700 Subject: [PATCH] Fix license headers in Cassandra related files Summary: I might have missed these while doing some recent cassandra code reviews. Closes https://github.com/facebook/rocksdb/pull/2663 Differential Revision: D5520138 Pulled By: sagar0 fbshipit-source-id: 340930afe9efe03c75f535a1da1f89bd3e53c1f9 --- include/rocksdb/utilities/debug.h | 4 +--- java/rocksjni/cassandra_value_operator.cc | 4 +--- .../java/org/rocksdb/CassandraCompactionFilter.java | 8 ++++---- .../java/org/rocksdb/CassandraValueMergeOperator.java | 4 +--- utilities/cassandra/merge_operator.cc | 4 +--- utilities/cassandra/merge_operator.h | 4 +--- utilities/cassandra/serialize.h | 4 +--- utilities/cassandra/test_utils.cc | 10 ++++------ utilities/cassandra/test_utils.h | 4 +--- 9 files changed, 15 insertions(+), 31 deletions(-) diff --git a/include/rocksdb/utilities/debug.h b/include/rocksdb/utilities/debug.h index f29fa045c..3e325f69a 100644 --- a/include/rocksdb/utilities/debug.h +++ b/include/rocksdb/utilities/debug.h @@ -1,9 +1,7 @@ -// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. +// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -// This source code is also licensed under the GPLv2 license found in the -// COPYING file in the root directory of this source tree. #pragma once diff --git a/java/rocksjni/cassandra_value_operator.cc b/java/rocksjni/cassandra_value_operator.cc index 6be661407..aa58eccc2 100644 --- a/java/rocksjni/cassandra_value_operator.cc +++ b/java/rocksjni/cassandra_value_operator.cc @@ -1,9 +1,7 @@ -// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. +// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -// This source code is also licensed under the GPLv2 license found in the -// COPYING file in the root directory of this source tree. #include #include diff --git a/java/src/main/java/org/rocksdb/CassandraCompactionFilter.java b/java/src/main/java/org/rocksdb/CassandraCompactionFilter.java index 05d9aabcf..26bf35883 100644 --- a/java/src/main/java/org/rocksdb/CassandraCompactionFilter.java +++ b/java/src/main/java/org/rocksdb/CassandraCompactionFilter.java @@ -1,7 +1,7 @@ -// Copyright (c) 2011-present, Facebook, Inc. All rights reserved. -// This source code is licensed under the BSD-style license found in the -// LICENSE file in the root directory of this source tree. An additional grant -// of patent rights can be found in the PATENTS file in the same directory. +// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). package org.rocksdb; diff --git a/java/src/main/java/org/rocksdb/CassandraValueMergeOperator.java b/java/src/main/java/org/rocksdb/CassandraValueMergeOperator.java index 55d67a3a3..a09556a2b 100644 --- a/java/src/main/java/org/rocksdb/CassandraValueMergeOperator.java +++ b/java/src/main/java/org/rocksdb/CassandraValueMergeOperator.java @@ -1,9 +1,7 @@ -// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. +// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -// This source code is also licensed under the GPLv2 license found in the -// COPYING file in the root directory of this source tree. package org.rocksdb; diff --git a/utilities/cassandra/merge_operator.cc b/utilities/cassandra/merge_operator.cc index 75817a78b..3c9cb7f74 100644 --- a/utilities/cassandra/merge_operator.cc +++ b/utilities/cassandra/merge_operator.cc @@ -1,9 +1,7 @@ -// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. +// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -// This source code is also licensed under the GPLv2 license found in the -// COPYING file in the root directory of this source tree. #include "merge_operator.h" diff --git a/utilities/cassandra/merge_operator.h b/utilities/cassandra/merge_operator.h index b46662c26..edbf12001 100644 --- a/utilities/cassandra/merge_operator.h +++ b/utilities/cassandra/merge_operator.h @@ -1,9 +1,7 @@ -// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. +// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -// This source code is also licensed under the GPLv2 license found in the -// COPYING file in the root directory of this source tree. #pragma once #include "rocksdb/merge_operator.h" diff --git a/utilities/cassandra/serialize.h b/utilities/cassandra/serialize.h index 0e35d34af..64ccd4c29 100644 --- a/utilities/cassandra/serialize.h +++ b/utilities/cassandra/serialize.h @@ -1,9 +1,7 @@ -// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. +// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -// This source code is also licensed under the GPLv2 license found in the -// COPYING file in the root directory of this source tree. /** * Helper functions which serialize and deserialize integers diff --git a/utilities/cassandra/test_utils.cc b/utilities/cassandra/test_utils.cc index 68d0381e0..61f53b2d3 100644 --- a/utilities/cassandra/test_utils.cc +++ b/utilities/cassandra/test_utils.cc @@ -1,9 +1,7 @@ -// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. -// This source code is licensed under the BSD-style license found in the -// LICENSE file in the root directory of this source tree. An additional grant -// of patent rights can be found in the PATENTS file in the same directory. -// This source code is also licensed under the GPLv2 license found in the -// COPYING file in the root directory of this source tree. +// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). #include "test_utils.h" diff --git a/utilities/cassandra/test_utils.h b/utilities/cassandra/test_utils.h index 7ca6cfd61..463b12bf2 100644 --- a/utilities/cassandra/test_utils.h +++ b/utilities/cassandra/test_utils.h @@ -1,9 +1,7 @@ -// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. +// Copyright (c) 2017-present, Facebook, Inc. All rights reserved. // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -// This source code is also licensed under the GPLv2 license found in the -// COPYING file in the root directory of this source tree. #pragma once #include