archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4920 from eirinikos/update-license

Browse Source 
edit Serverless license info so that GitHub recognizes it
This commit is contained in:
Takahiro Horike 2018-04-19 18:39:26 +09:00 committed by GitHub
commit d648dc6d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LICENSE.txt
View File

@ -1,12 +1,5 @@
The MIT License (MIT)
Copyright (c) 2018 Serverless, Inc. http://www.serverless.com
The following license applies to all parts of this software except as
documented below:
====
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
@ -24,10 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
====
All files located in the node_modules and external directories are
externally maintained libraries used by this software which have their
own licenses; we recommend you read them, as their terms may differ from
the terms above.

7
README.md
View File

@ -33,6 +33,7 @@ Serverless is an MIT open-source project, actively maintained by a full-time, ve
* [Contributing](#contributing)
* [Community](#community)
* [Consultants](#consultants)
* [Licensing](#licensing)
* [Previous Version 0.5.x](#v.5)
## <a name="quick-start"></a>Quick Start
@ -432,6 +433,12 @@ These consultants use the Serverless Framework and can help you build your serve
* [Seraro](http://www.seraro.com/) - Who also runs Atlanta Serverless Meetup (https://www.meetup.com/Atlanta-CABI-Camp-Cloud-AI-Blockchain-IOT) and Delhi Serverless Meetup (https://www.meetup.com/Delhi-NCR-Serverless-Architecture-Meetup/)
----
## <a name="licensing"></a>Licensing
Serverless is licensed under the [MIT License](./LICENSE.txt).
All files located in the node_modules and external directories are externally maintained libraries used by this software which have their own licenses; we recommend you read them, as their terms may differ from the terms in the MIT License.
# <a name="v.5"></a>Previous Serverless Version 0.5.x
You can find projects and plugins relating to version 0.5 [here](./0.5.x-RESOURCES.md). Note that these are not compatible with v1.0 but we are working diligently on updating them. [Guide on building v1.0 plugins](./docs/providers/aws/guide/plugins.md).