Skip to content
This repository has been archived by the owner on Jan 18, 2024. It is now read-only.

Commit

Permalink
Move copyright information to NOTICE and other small changes
Browse files Browse the repository at this point in the history
  • Loading branch information
mfreed authored and feikesteenbergen committed Oct 16, 2019
1 parent 188848d commit dda759c
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 39 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to TimescaleDB
# Contributing to TimescaleDB Kubernetes

We appreciate any help the community can provide to make TimescaleDB better!
We appreciate any help the community can provide to make TimescaleDB better!

You can help in different ways:

Expand All @@ -15,6 +15,6 @@ discuss your proposed improvement (and its implementation) with the core
development team.

Before we accept any code contributions, Timescale contributors need to
sign the [Contributor License Agreement](https://cla-assistant.io/timescale/timescaledb) (CLA). By signing a CLA, we can
sign the [Contributor License Agreement](https://cla-assistant.io/timescale/timescaledb-kubernetes) (CLA). By signing a CLA, we can
ensure that the community is free and confident in its ability to use your
contributions.
contributions.
25 changes: 0 additions & 25 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -175,28 +175,3 @@
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

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

https://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.
20 changes: 18 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
TimescaleDB (TM) Kubernetes

Copyright (c) 2019 Timescale, Inc. 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.

========================================================================
NOTICES
========================================================================

Certain files in this code base have been modified and/or copied,
either partially or wholely, from source code from the Helm
Cloud Native Computing Foundation project.
either partially or wholely, from source code from Charts for Helm
from The Helm Project, which is similarly licensed under the
open-source Apache License, Version 2.0.

https://github.com/helm/charts/tree/master/incubator/patroni
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# TimescaleDB Kubernetes

This repository contains Helm charts to help with the deployment of [TimescaleDB](https://github.com/timescale/timescaledb/) on
Kubernetes. This project is currently in active development.
This repository contains Helm charts to help with the deployment of
[TimescaleDB](https://github.com/timescale/timescaledb/) on Kubernetes. This
project is currently in active development.

Supported Versions:
- Kubernetes: [AWS EKS](https://aws.amazon.com/eks/), [MicroK8s](https://microk8s.io/), [minikube](https://github.com/kubernetes/minikube/releases)
- Kubernetes: [AWS EKS](https://aws.amazon.com/eks/), [MicroK8s](https://microk8s.io/), and [minikube](https://github.com/kubernetes/minikube/releases)

# Recipes

Expand All @@ -16,9 +17,8 @@ Supported Versions:
# Additional documentation

- [Why use TimescaleDB?](https://docs.timescale.com/introduction)
- [Migrating from PostgreSQL](https://docs.timescale.com/getting-started/setup/migrate-from-postgresql)
- [Writing data](https://docs.timescale.com/using-timescaledb/writing-data)
- [Querying and data analytics](https://docs.timescale.com/using-timescaledb/reading-data)
- [Installing TimescaleDB](https://docs.timescale.com/getting-started/installation)
- [Migrating data to TimescaleDB](https://docs.timescale.com/getting-started/migrating-data)
- [Tutorials and sample data](https://docs.timescale.com/tutorials)

## Get Help
Expand All @@ -27,8 +27,8 @@ Supported Versions:

## License

TimescaleDB Kubernetes resources in this repository are released under the [Apache 2.0 license](LICENSE)
TimescaleDB Kubernetes resources in this repository are released under the [Apache 2.0 license](LICENSE).

## Contributing

If you wish to make contributions to this project, refer to [Contributor Instructions](CONTRIBUTING.md) for more information.
If you wish to make contributions to this project, please refer to [Contributor Instructions](CONTRIBUTING.md) for more information.

0 comments on commit dda759c

Please sign in to comment.