Skip to content

Commit 0559332

Browse files
authored
Merge pull request #90 from codecov/cwlw/fsl-1.1
Upgrade to FSL-1.1
2 parents b7e8860 + 46f9055 commit 0559332

File tree

1 file changed

+17
-20
lines changed

1 file changed

+17
-20
lines changed

LICENSE.md

+17-20
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Functional Source License, Version 1.0, Apache 2.0 Change License
1+
# Functional Source License, Version 1.1, Apache 2.0 Future License
22

33
## Abbreviation
44

5-
FSL-1.0-Apache-2.0
5+
FSL-1.1-Apache-2.0
66

77
## Notice
88

9-
Copyright 2022-2023 Functional Software, Inc. dba Sentry
9+
Copyright 2022-2024 Functional Software, Inc. dba Sentry
1010

1111
## Terms and Conditions
1212

@@ -30,18 +30,15 @@ and redistribute the Software for any Permitted Purpose identified below.
3030
### Permitted Purpose
3131

3232
A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
33-
means use of the Software in or for a commercial product or service that
34-
competes with the Software or any other product or service we offer using the
35-
Software as of the date we make the Software available.
33+
means making the Software available to others in a commercial product or
34+
service that:
3635

37-
Competing Uses specifically include using the Software:
36+
1. substitutes for the Software;
3837

39-
1. as a substitute for any of our products or services;
38+
2. substitutes for any other product or service we offer using the Software
39+
that exists as of the date we make the Software available; or
4040

41-
2. in a way that exposes the APIs of the Software; and
42-
43-
3. in a product or service that offers the same or substantially similar
44-
functionality to the Software.
41+
3. offers the same or substantially similar functionality as the Software.
4542

4643
Permitted Purposes specifically include using the Software:
4744

@@ -51,9 +48,8 @@ Permitted Purposes specifically include using the Software:
5148

5249
3. for non-commercial research; and
5350

54-
4. in connection with software development services or managed services that
55-
you provide to a licensee using the Software in accordance with these Terms
56-
and Conditions.
51+
4. in connection with professional services that you provide to a licensee
52+
using the Software in accordance with these Terms and Conditions.
5753

5854
### Patents
5955

@@ -88,12 +84,13 @@ Except for displaying the License Details and identifying us as the origin of
8884
the Software, you have no right under these Terms and Conditions to use our
8985
trademarks, trade names, service marks or product names.
9086

91-
## Change License
87+
## Grant of Future License
9288

93-
On the second anniversary of the date we make the Software available, the
94-
Software will become available under the Apache 2.0 license. On that date, the
95-
Terms and Conditions above automatically terminate and the following terms
96-
become effective:
89+
We hereby irrevocably grant you an additional license to use the Software under
90+
the Apache License, Version 2.0 that is effective on the second anniversary of
91+
the date we make the Software available. On or after that date, you may use the
92+
Software under the Apache License, Version 2.0, in which case the following
93+
will apply:
9794

9895
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
9996
this file except in compliance with the License.

0 commit comments

Comments
 (0)