Merge branch 'master' into master-merge
Retaining older version of udpt... This merge also replaces UDPT's license from GPLv3 to MIT.
This commit is contained in:
commit
c12d91cfc5
14
Dockerfile
14
Dockerfile
|
@ -1,7 +1,7 @@
|
||||||
FROM rust:latest
|
FROM rust:latest
|
||||||
COPY . /usr/src/udpt
|
COPY . /usr/src/udpt
|
||||||
WORKDIR /usr/src/udpt
|
WORKDIR /usr/src/udpt
|
||||||
|
|
||||||
RUN cargo build --release -j4
|
RUN cargo build --release -j4
|
||||||
|
|
||||||
CMD ["target/release/udpt-rs", "-c", "/usr/src/udpt/udpt.toml"]
|
CMD ["target/release/udpt-rs", "-c", "/usr/src/udpt/udpt.toml"]
|
||||||
|
|
43
LICENSE
43
LICENSE
|
@ -1,21 +1,22 @@
|
||||||
MIT License
|
<<<<<<< HEAD
|
||||||
|
MIT License
|
||||||
Copyright (c) 2018 Naim A.
|
|
||||||
|
Copyright (c) 2018 Naim A.
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
in the Software without restriction, including without limitation the rights
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
in the Software without restriction, including without limitation the rights
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
furnished to do so, subject to the following conditions:
|
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 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,
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
SOFTWARE.
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
|
Loading…
Reference in a new issue