From a2d467257f546bee73678f8a501389d7b0c8fa86 Mon Sep 17 00:00:00 2001 From: Lucien Volmar Date: Fri, 16 Apr 2021 14:32:35 -0700 Subject: [PATCH 1/4] Update license.md --- aerospike/license.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/aerospike/license.md b/aerospike/license.md index e7ba65d90444..0cabf1006340 100644 --- a/aerospike/license.md +++ b/aerospike/license.md @@ -1,5 +1,12 @@ -Copyright 2014-2015 Aerospike, Inc. +Copyright 2020-2021 Aerospike, Inc. -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](http://www.apache.org/licenses/LICENSE-2.0). +Community Edition is 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](http://www.apache.org/licenses/LICENSE-2.0). + +If you are using the Aerospike Database EE evaluation feature key file, you are +operating under the [Aerospike Evaluation License Agreement](https://www.aerospike.com/forms/evaluation-license-agreement/). + +If you are using a feature key file you received as part of your commercial +enterprise license, you are operating under the +[Aerospike Master License Agreement](https://www.aerospike.com/forms/master-license%20-agreement/). 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. From 6b455bc8472f4e8b61b428b0b8807e19d1d1eec8 Mon Sep 17 00:00:00 2001 From: Lucien Volmar Date: Fri, 16 Apr 2021 14:57:46 -0700 Subject: [PATCH 2/4] Update license.md --- aerospike/license.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/aerospike/license.md b/aerospike/license.md index 0cabf1006340..f6c0e209640c 100644 --- a/aerospike/license.md +++ b/aerospike/license.md @@ -1,12 +1,10 @@ Copyright 2020-2021 Aerospike, Inc. -Community Edition is 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](http://www.apache.org/licenses/LICENSE-2.0). +Aerospike Community Edition is 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](http://www.apache.org/licenses/LICENSE-2.0). -If you are using the Aerospike Database EE evaluation feature key file, you are -operating under the [Aerospike Evaluation License Agreement](https://www.aerospike.com/forms/evaluation-license-agreement/). +If you are using the Aerospike Database EE evaluation feature key file, you are operating under the [Aerospike Evaluation License Agreement](https://www.aerospike.com/forms/evaluation-license-agreement/). -If you are using a feature key file you received as part of your commercial -enterprise license, you are operating under the -[Aerospike Master License Agreement](https://www.aerospike.com/forms/master-license%20-agreement/). +If you are using a feature key file you received as part of your commercial enterprise license, you are operating under the [Aerospike Master License Agreement](https://www.aerospike.com/forms/master-license%20-agreement/). 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. + From 1d98ec078a60e983d3d6f0dd149d5c8d7784896a Mon Sep 17 00:00:00 2001 From: Lucien Volmar Date: Fri, 16 Apr 2021 15:04:24 -0700 Subject: [PATCH 3/4] Update license.md --- aerospike/license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aerospike/license.md b/aerospike/license.md index f6c0e209640c..707cc1cd3f66 100644 --- a/aerospike/license.md +++ b/aerospike/license.md @@ -4,7 +4,7 @@ Aerospike Community Edition is licensed under the Apache License, Version 2.0 (t If you are using the Aerospike Database EE evaluation feature key file, you are operating under the [Aerospike Evaluation License Agreement](https://www.aerospike.com/forms/evaluation-license-agreement/). -If you are using a feature key file you received as part of your commercial enterprise license, you are operating under the [Aerospike Master License Agreement](https://www.aerospike.com/forms/master-license%20-agreement/). +If you are using a feature key file you received as part of your commercial enterprise license, you are operating under the [Aerospike Master License Agreement](https://www.aerospike.com/forms/master-license-agreement/). 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. From 1ed4cbe34e28fa2f02f15daecf7bcc2566f77585 Mon Sep 17 00:00:00 2001 From: Lucien Volmar Date: Fri, 16 Apr 2021 15:10:05 -0700 Subject: [PATCH 4/4] Update license.md --- aerospike/license.md | 1 - 1 file changed, 1 deletion(-) diff --git a/aerospike/license.md b/aerospike/license.md index 707cc1cd3f66..0e010ef114ff 100644 --- a/aerospike/license.md +++ b/aerospike/license.md @@ -7,4 +7,3 @@ If you are using the Aerospike Database EE evaluation feature key file, you are If you are using a feature key file you received as part of your commercial enterprise license, you are operating under the [Aerospike Master License Agreement](https://www.aerospike.com/forms/master-license-agreement/). 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. -