Repository: incubator-samza
Updated Branches:
  refs/heads/master cf90e33a8 -> 03eff9b5a


SAMZA-319: Using the correct short version of the LICENSE


Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/03eff9b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/03eff9b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/03eff9b5

Branch: refs/heads/master
Commit: 03eff9b5a52a3fafe677d2f5b7cab0090cc5c1c4
Parents: cf90e33
Author: Chinmay Soman <[email protected]>
Authored: Wed Nov 12 15:57:46 2014 -0800
Committer: Chinmay Soman <[email protected]>
Committed: Wed Nov 12 15:59:17 2014 -0800

----------------------------------------------------------------------
 LICENSE | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/03eff9b5/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d645695..e1439fe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,55 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+=======================================================================
+
+APACHE SAMZA SUBCOMPONENTS:
+
+The Apache Samza project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+-----------------------------------------------------------------------
+ The MIT License
+-----------------------------------------------------------------------
+
+The Apache Samza project bundles the following files  under the MIT License:
+
+- Bootstrap v3.1.1 (http://getbootstrap.com) - Copyright (c) 2011-2014 
Twitter, Inc
+- Font-awesome css files v4.1.0 (http://fortawesome.github.io/Font-Awesome/) - 
Copyright (c) 2013  Dave Gandy
+- Glyphicons fonts v3.1.1 (http://glyphicons.com/) - Copyright (c) 2010-2014 
Jan Kovařík
+- jquery.tablesorter.min.js v2.0.5 (http://tablesorter.com/docs/) - Copyright 
(c) 2014 Christian Bach
+- jquery-1.11.1.min.js v1.11.1 (http://jquery.com/) - Copyright 2014 jQuery 
Foundation and other contributors
+
+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:
+
+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.
+
+-----------------------------------------------------------------------
+ The Open Font License
+-----------------------------------------------------------------------
+
+The Apache Samza project bundles the following fonts under the 
+SIL Open Font License (OFT) - http://scripts.sil.org/OFL/
+
+- Font-awesome font files v4.0.3 (http://fortawesome.github.io/Font-Awesome/)
+- Ropa Sans fonts v1.1 - Copyright (c) 2011, Botjo Nikoltchev, with Reserved 
Font Name "Ropa Sans"
+

Reply via email to