From 518329299b2e6dba700473c78fd712c22a26e288 Mon Sep 17 00:00:00 2001 From: udi-speedb <106253580+udi-speedb@users.noreply.github.com> Date: Mon, 6 Nov 2023 17:56:26 +0200 Subject: [PATCH] Documentation: Add the request to add Speedb's license when modifying an existing RocksDB file (#744) --- CONTRIBUTING.md | 33 +++++++++++++++++++++++++++++++++ HISTORY.md | 1 + 2 files changed, 34 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a0afda7914..6f7d3032fb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -162,6 +162,8 @@ A license is required at the top of all documents and files. ### Source files +#### New Source Files + Every new source file should have the following header at the top: ``` @@ -182,6 +184,37 @@ limitations under the License. Replace `` in the copyright notice above with the current year. +#### RocksDB Source Files + +When modifying files that exist in RocksDB that already have a Facebook or LevelDB license header +Add the following header at the top, **preceding the Facebook and/or LevelDB license header** as follows: + +``` +Copyright (C) Speedb Ltd. All rights reserved. + +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. + +Copyright (c) 2011-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). +Copyright (c) 2011 The LevelDB Authors. All rights reserved. +Use of this source code is governed by a BSD-style license that can be +found in the LICENSE file. See the AUTHORS file for names of contributors. +``` + +Replace `` in the copyright notice above with the current year. + ### Markdown Markdown files should have at the top: diff --git a/HISTORY.md b/HISTORY.md index d4a3411ef3..3afd26a468 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -38,6 +38,7 @@ Based on RocksDB 8.1.1 ### Miscellaneous * Unit tests: Disable CancelCompactionWaitingOnConflict and CompactionLimiter in db_compaction_test since they sometimes fail or get stuck. These need to be investigated and reenabled (#711). +* Documentation: Update CONTRIBUTING.md guide to request contributors to add Speedb's license when modifying existing Rocksdb Files (#713). ## Grapes v2.6.0 (8/22/2023) Based on RocksDB 8.1.1