From b8ab44eb625bf3188521fff132684f6b4d6d5073 Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Fri, 12 Apr 2019 11:57:28 -0500 Subject: [PATCH] Fix enterprise license header and add shardwidth files to license header check --- Makefile | 2 +- enterprise/enterprise.go | 14 -------------- shardwidth/16.go | 14 ++++++++++++++ shardwidth/17.go | 14 ++++++++++++++ shardwidth/18.go | 14 ++++++++++++++ shardwidth/19.go | 14 ++++++++++++++ shardwidth/20.go | 14 ++++++++++++++ shardwidth/21.go | 14 ++++++++++++++ shardwidth/22.go | 14 ++++++++++++++ shardwidth/23.go | 14 ++++++++++++++ shardwidth/24.go | 14 ++++++++++++++ shardwidth/25.go | 14 ++++++++++++++ shardwidth/26.go | 14 ++++++++++++++ shardwidth/27.go | 14 ++++++++++++++ shardwidth/28.go | 14 ++++++++++++++ shardwidth/29.go | 14 ++++++++++++++ shardwidth/30.go | 14 ++++++++++++++ shardwidth/31.go | 14 ++++++++++++++ shardwidth/32.go | 14 ++++++++++++++ 19 files changed, 239 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 9ced6c510..3fa415ccb 100644 --- a/Makefile +++ b/Makefile @@ -159,7 +159,7 @@ check-license-headers: SHELL:=/bin/bash check-license-headers: @! find . -name '*.go' | grep -v '^./vendor' | while read fn;\ do [[ `head -13 $$fn | shasum | cut -f 1 -d " "` == $(LICENSE_HASH) ]] || echo $$fn; done | \ - grep -v apimethod_string.go | grep -v pb.go | grep -v peg.go | grep -v lru.go | grep -v btree + grep -v apimethod_string.go | grep -v pb.go | grep -v peg.go | grep -v lru.go | grep -v btree | grep -v enterprise ###################### # Build dependencies # diff --git a/enterprise/enterprise.go b/enterprise/enterprise.go index 2075f7a4d..a75223801 100644 --- a/enterprise/enterprise.go +++ b/enterprise/enterprise.go @@ -1,17 +1,3 @@ -// Copyright 2017 Pilosa Corp. -// -// 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) 2018 Pilosa Corp. All rights reserved. // // This file is part of Pilosa Enterprise Edition. diff --git a/shardwidth/16.go b/shardwidth/16.go index f9e90c047..6334bf254 100644 --- a/shardwidth/16.go +++ b/shardwidth/16.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth16 package shardwidth diff --git a/shardwidth/17.go b/shardwidth/17.go index 65653456e..b6ba8d907 100644 --- a/shardwidth/17.go +++ b/shardwidth/17.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth17 package shardwidth diff --git a/shardwidth/18.go b/shardwidth/18.go index 1357a3c17..f69647681 100644 --- a/shardwidth/18.go +++ b/shardwidth/18.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth18 package shardwidth diff --git a/shardwidth/19.go b/shardwidth/19.go index a3333540c..e9920326b 100644 --- a/shardwidth/19.go +++ b/shardwidth/19.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth19 package shardwidth diff --git a/shardwidth/20.go b/shardwidth/20.go index e45c5a472..5505656dd 100644 --- a/shardwidth/20.go +++ b/shardwidth/20.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build !shardwidth16,!shardwidth17,!shardwidth18,!shardwidth19,!shardwidth21,!shardwidth22,!shardwidth23,!shardwidth24,!shardwidth25,!shardwidth26,!shardwidth27,!shardwidth28,!shardwidth29,!shardwidth30,!shardwidth31,!shardwidth32 package shardwidth diff --git a/shardwidth/21.go b/shardwidth/21.go index edaf0a010..0ab1be104 100644 --- a/shardwidth/21.go +++ b/shardwidth/21.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth21 package shardwidth diff --git a/shardwidth/22.go b/shardwidth/22.go index ab75e51da..9b07fff50 100644 --- a/shardwidth/22.go +++ b/shardwidth/22.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth22 package shardwidth diff --git a/shardwidth/23.go b/shardwidth/23.go index 2535a2dee..03c5cd91c 100644 --- a/shardwidth/23.go +++ b/shardwidth/23.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth23 package shardwidth diff --git a/shardwidth/24.go b/shardwidth/24.go index b1275afd8..7e175b1bc 100644 --- a/shardwidth/24.go +++ b/shardwidth/24.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth24 package shardwidth diff --git a/shardwidth/25.go b/shardwidth/25.go index 9599ba5a3..776655580 100644 --- a/shardwidth/25.go +++ b/shardwidth/25.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth25 package shardwidth diff --git a/shardwidth/26.go b/shardwidth/26.go index e7dfdd13b..1459686bc 100644 --- a/shardwidth/26.go +++ b/shardwidth/26.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth26 package shardwidth diff --git a/shardwidth/27.go b/shardwidth/27.go index 568a798f8..9eb7ff830 100644 --- a/shardwidth/27.go +++ b/shardwidth/27.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth27 package shardwidth diff --git a/shardwidth/28.go b/shardwidth/28.go index bb43cd5a3..b3c38c944 100644 --- a/shardwidth/28.go +++ b/shardwidth/28.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth28 package shardwidth diff --git a/shardwidth/29.go b/shardwidth/29.go index f797b632d..e2b29faf1 100644 --- a/shardwidth/29.go +++ b/shardwidth/29.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth29 package shardwidth diff --git a/shardwidth/30.go b/shardwidth/30.go index aac761c82..a8684c236 100644 --- a/shardwidth/30.go +++ b/shardwidth/30.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth30 package shardwidth diff --git a/shardwidth/31.go b/shardwidth/31.go index 12f85bfcf..1dcd40ebb 100644 --- a/shardwidth/31.go +++ b/shardwidth/31.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth31 package shardwidth diff --git a/shardwidth/32.go b/shardwidth/32.go index 76dde6b04..d9408285b 100644 --- a/shardwidth/32.go +++ b/shardwidth/32.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// 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. + // +build shardwidth32 package shardwidth