scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-08 11:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update licensing and NOTICE to reflect btree being moved to roaring

Browse source
This commit is contained in:
Matt Jaffee 2019-03-05 15:52:32 -06:00
parent 831195e7d2
commit b71096b688
No known key found for this signature in database
GPG key ID: 08A3DFFF987B11BF
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
NOTICE
View file

@ -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.

9
enterprise/enterprise.go
View file

@ -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 <http://www.gnu.org/licenses/>.
// 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 (

23
roaring/containers_btree.go
View file

@ -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 <http://www.gnu.org/licenses/>.
// 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