Update license from dual Apache 2.0/MIT to just MIT.

google · Feb 8, 2016 · a58dea0 · a58dea0
1 parent 5d05eba
commit a58dea0
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 241 deletions.
diff --git a/LICENSE-MIT → LICENSE b/LICENSE-MIT → LICENSE
@@ -1,3 +1,5 @@
+The MIT License (MIT)
+
 Copyright 2016 Google Inc. All Rights Reserved.
 
 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:

diff --git a/LICENSE-APACHE b/LICENSE-APACHE
diff --git a/README.md b/README.md
@@ -41,7 +41,6 @@ and make it easy and ergonomic to write servers without dealing with sockets or
 directly. See the tarpc_examples package for more sophisticated examples.
 
 ## Additional Features
-- Imports can be specified in an `item {}` block that appears above the `service {}` block.
 - Attributes can be specified on rpc methods. These will be included on both the `Service` trait
   methods as well as on the `Client`'s stub methods.
 
@@ -57,7 +56,6 @@ To contribute to Tarpc, please see [CONTRIBUTING](CONTRIBUTING.md).
 
 ## License
 
-Tarpc is distributed under the terms of both the MIT license
-and the Apache License (Version 2.0).
+Tarpc is distributed under the terms of the MIT license.
 
-See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) for details.
+See [LICENSE](LICENSE) for details.
diff --git a/hooks/pre-commit b/hooks/pre-commit
@@ -1,10 +1,7 @@
 # Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
+# Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
+# This file may not be copied, modified, or distributed except according to those terms.
 
 #!/bin/sh
 #

diff --git a/hooks/pre-push b/hooks/pre-push
@@ -1,10 +1,7 @@
 # Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
+# Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
+# This file may not be copied, modified, or distributed except according to those terms.
 
 #!/bin/sh
 

diff --git a/tarpc/install-hooks.sh b/tarpc/install-hooks.sh
@@ -1,10 +1,7 @@
 # Copyright 2016 Google Inc. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
+# Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
+# This file may not be copied, modified, or distributed except according to those terms.
 
 #!/bin/sh
 ln -s ../../hooks/pre-commit .git/hooks/pre-commit

diff --git a/tarpc/src/lib.rs b/tarpc/src/lib.rs
@@ -1,10 +1,7 @@
 // Copyright 2016 Google Inc. All Rights Reserved.
 //
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
+// This file may not be copied, modified, or distributed except according to those terms.
 
 //! An RPC library for Rust.
 //!

diff --git a/tarpc/src/macros.rs b/tarpc/src/macros.rs
@@ -1,10 +1,7 @@
 // Copyright 2016 Google Inc. All Rights Reserved.
 //
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
+// This file may not be copied, modified, or distributed except according to those terms.
 
 #[doc(hidden)]
 #[macro_export]

diff --git a/tarpc/src/protocol/client.rs b/tarpc/src/protocol/client.rs
@@ -1,3 +1,8 @@
+// Copyright 2016 Google Inc. All Rights Reserved.
+//
+// Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
+// This file may not be copied, modified, or distributed except according to those terms.
+//
 use bincode;
 use serde;
 use std::fmt;

diff --git a/tarpc/src/protocol/mod.rs b/tarpc/src/protocol/mod.rs
@@ -1,10 +1,7 @@
 // Copyright 2016 Google Inc. All Rights Reserved.
 //
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
+// This file may not be copied, modified, or distributed except according to those terms.
 
 use bincode;
 use std::io;

diff --git a/tarpc/src/protocol/server.rs b/tarpc/src/protocol/server.rs
@@ -1,3 +1,8 @@
+// Copyright 2016 Google Inc. All Rights Reserved.
+//
+// Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
+// This file may not be copied, modified, or distributed except according to those terms.
+
 use bincode;
 use serde;
 use scoped_pool::Pool;

diff --git a/tarpc_examples/src/lib.rs b/tarpc_examples/src/lib.rs
@@ -1,10 +1,7 @@
 // Copyright 2016 Google Inc. All Rights Reserved.
 //
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
+// This file may not be copied, modified, or distributed except according to those terms.
 
 #[test]
 fn it_works() {