Skip to content

Commit

Permalink
style: change license (#2100)
Browse files Browse the repository at this point in the history
  • Loading branch information
baerwang authored Nov 6, 2023
1 parent d6ea4e2 commit 5a3102a
Show file tree
Hide file tree
Showing 20 changed files with 72 additions and 140 deletions.
19 changes: 4 additions & 15 deletions integrate_test.sh
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You 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) 2023-present, Qihoo, 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.

#!/bin/bash

Expand Down
5 changes: 5 additions & 0 deletions src/net/src/build_version.cc.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// Copyright (c) 2015-present, Qihoo, 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.

#include "net/include/build_version.h"
const char* net_build_git_sha = "net_build_git_sha:@@GIT_SHA@@";
const char* net_build_git_date = "net_build_git_date:@@GIT_DATE_TIME@@";
Expand Down
1 change: 1 addition & 0 deletions src/net/src/http_conn.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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.

#include "net/include/http_conn.h"
#include <climits>
#include <cstdio>
Expand Down
1 change: 1 addition & 0 deletions src/net/src/net_thread_name.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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.

#ifndef NET_THREAD_NAME_H
#define NET_THREAD_NAME_H

Expand Down
1 change: 1 addition & 0 deletions src/net/src/net_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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.

#include "net/src/net_util.h"
#include <fcntl.h>
#include <netinet/in.h>
Expand Down
5 changes: 5 additions & 0 deletions src/pstd/src/build_version.cc
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// Copyright (c) 2015-present, Qihoo, 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.

#include "pstd/include/version.h"
const char* pstd_build_git_sha = "pstd_build_git_sha:2f67b928b3ccd2f23109802aa9932a7af45abcd9";
const char* pstd_build_git_date = "pstd_build_git_date:2023-03-27";
Expand Down
19 changes: 4 additions & 15 deletions tests/integration/integrate_test.sh
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You 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) 2023-present, Qihoo, 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.

go mod tidy
go test
2 changes: 1 addition & 1 deletion tools/pika-port/build2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# DESC : pika-port2 build script
# AUTHOR : Alex Stocks
# VERSION : 1.0
# LICENCE : Apache License 2.0
# LICENCE : BSD-3-Clause License
# EMAIL : [email protected]
# MOD : 2019-01-22 19:54
# FILE : build.sh
Expand Down
2 changes: 1 addition & 1 deletion tools/pika-port/build3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# DESC : pika-port3 build script
# AUTHOR : Alex Stocks
# VERSION : 1.0
# LICENCE : Apache License 2.0
# LICENCE : BSD-3-Clause License
# EMAIL : [email protected]
# MOD : 2019-01-22 19:54
# FILE : build.sh
Expand Down
2 changes: 1 addition & 1 deletion tools/pika-port/glog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# DESC : glog build script
# AUTHOR : Alex Stocks
# VERSION : 1.0
# LICENCE : Apache License 2.0
# LICENCE : BSD-3-Clause License
# EMAIL : [email protected]
# MOD : 2019-01-22 19:54
# FILE : build.sh
Expand Down
22 changes: 6 additions & 16 deletions tools/pika_operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ It is responsible for creating and managing the following resources:

## Getting Started

You’ll need a Kubernetes cluster to run against. You can use [MiniKube](https://minikube.sigs.k8s.io)
You’ll need a Kubernetes cluster to run against. You can use [MiniKube](https://minikube.sigs.k8s.io)
or [KIND](https://kind.sigs.k8s.io) to get a local cluster for testing, or run against a remote cluster.

**Note:** Your controller will automatically use the current context in your kubeconfig file (i.e. whatever
Expand All @@ -22,7 +22,7 @@ cluster `kubectl cluster-info` shows).
### Running locally with MiniKube

1. Install [MiniKube](https://minikube.sigs.k8s.io/docs/start/)

2. Start a local cluster:

```sh
Expand Down Expand Up @@ -147,17 +147,7 @@ More information can be found via the [Kubebuilder Documentation](https://book.k

## License

Copyright 2023.

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) 2023-present, Qihoo, 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.
7 changes: 7 additions & 0 deletions tools/pika_operator/api/v1alpha1/additional.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
Copyright (c) 2023-present, Qihoo, 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.
*/

package v1alpha1

const (
Expand Down
17 changes: 4 additions & 13 deletions tools/pika_operator/api/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
/*
Copyright 2023.
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) 2023-present, Qihoo, 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.
*/

// Package v1alpha1 contains API Schema definitions for the pika v1alpha1 API group
Expand Down
17 changes: 4 additions & 13 deletions tools/pika_operator/api/v1alpha1/pika_types.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
/*
Copyright 2023.
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) 2023-present, Qihoo, 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.
*/

package v1alpha1
Expand Down
17 changes: 4 additions & 13 deletions tools/pika_operator/api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 4 additions & 13 deletions tools/pika_operator/controllers/pika_controller.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
/*
Copyright 2023.
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) 2023-present, Qihoo, 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.
*/

package controllers
Expand Down
7 changes: 7 additions & 0 deletions tools/pika_operator/controllers/pika_controller_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
Copyright (c) 2023-present, Qihoo, 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.
*/

package controllers

import (
Expand Down
17 changes: 4 additions & 13 deletions tools/pika_operator/controllers/suite_test.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
/*
Copyright 2023.
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) 2023-present, Qihoo, 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.
*/

package controllers
Expand Down
17 changes: 4 additions & 13 deletions tools/pika_operator/hack/boilerplate.go.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/*
Copyright 2023.

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) 2023-present, Qihoo, 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.
*/
17 changes: 4 additions & 13 deletions tools/pika_operator/main.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
/*
Copyright 2023.
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) 2023-present, Qihoo, 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.
*/

package main
Expand Down

0 comments on commit 5a3102a

Please sign in to comment.