diff --git a/NOTICE b/NOTICE index 99ea00db4..5c905a32a 100644 --- a/NOTICE +++ b/NOTICE @@ -55,8 +55,8 @@ The file /pilosa/lru/lru.go contains a redistribution of lru See the License for the specific language governing permissions and limitations under the License. -The file /enterprise/b/btree.go contains a modified redistribution of b -(https://github.com/cznic/b); the license follows: +The files /enterprise/b/btree.go and /roaring/btree.go contain a modified +redistribution of b (https://github.com/cznic/b); the license follows: Copyright (c) 2014 The b Authors. All rights reserved. diff --git a/enterprise/enterprise.go b/enterprise/enterprise.go index f69ef1dd7..a75223801 100644 --- a/enterprise/enterprise.go +++ b/enterprise/enterprise.go @@ -15,10 +15,11 @@ // You should have received a copy of the GNU Affero General Public License // along with Pilosa Enterprise Edition. If not, see . -// Package enterprise injects enterprise implementations of various Pilosa -// features when Pilosa is built with "ENTERPRISE=1 make install". These -// features are dual-licensed separately from Pilosa community edition under the -// AGPL and Pilosa's commercial license. +// Package enterprise is now deprecated, and the functionality under +// enterprise/b has been copied into roaring/. It existed to inject enterprise +// implementations of various Pilosa features when Pilosa was built with +// "ENTERPRISE=1 make install". These features were dual-licensed separately +// from Pilosa community edition under the AGPL and Pilosa's commercial license. package enterprise import ( diff --git a/roaring/containers_btree.go b/roaring/containers_btree.go index 887f5b9a9..95066fe03 100644 --- a/roaring/containers_btree.go +++ b/roaring/containers_btree.go @@ -1,19 +1,16 @@ -// Copyright (c) 2018 Pilosa Corp. All rights reserved. +// Copyright (C) 2017-2018 Pilosa Corp. All rights reserved. // -// This file is part of Pilosa Enterprise Edition. +// 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 // -// Pilosa Enterprise Edition is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. +// http://www.apache.org/licenses/LICENSE-2.0 // -// Pilosa Enterprise Edition is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with Pilosa Enterprise Edition. If not, see . +// 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. package roaring