Skip to content

Commit

Permalink
Merge branch 'feature/license' into 'develop'
Browse files Browse the repository at this point in the history
Feature/license



See merge request !2
  • Loading branch information
saksmt committed Jun 29, 2016
2 parents c23920d + f51eb32 commit 6df4dbc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
9 changes: 9 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
The MIT License (MIT)

Copyright (c) 2016 Kirill Saksin

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 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# karaf-runner

Cross-platform (actually not tested) utility tool for running Apache Karaf
Cross-platform (actually not tested on M$ Windows) utility tool for running Apache Karaf

## Features

Expand Down Expand Up @@ -230,4 +230,8 @@ Modules
(semantically equal to "vanilla -A")
vanilla Install karaf and don't use any deployment files
```
```

## License

All source code is licensed under [MIT license](./LICENSE)

0 comments on commit 6df4dbc

Please sign in to comment.