You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by af...@apache.org on 2011/12/02 16:35:33 UTC
svn commit: r1209535 - in /incubator/accumulo/branches/1.4: ./ LICENSE
Author: afuchs
Date: Fri Dec 2 15:35:33 2011
New Revision: 1209535
URL: http://svn.apache.org/viewvc?rev=1209535&view=rev
Log:
ACCUMULO-204
Modified:
incubator/accumulo/branches/1.4/ (props changed)
incubator/accumulo/branches/1.4/LICENSE
Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 2 15:35:33 2011
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532
/incubator/accumulo/branches/1.4:1205476
/incubator/accumulo/trunk:1205476,1205570,1208726
Modified: incubator/accumulo/branches/1.4/LICENSE
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/LICENSE?rev=1209535&r1=1209534&r2=1209535&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/LICENSE (original)
+++ incubator/accumulo/branches/1.4/LICENSE Fri Dec 2 15:35:33 2011
@@ -248,8 +248,12 @@ For the src/server/src/main/resources/we
The MIT License
- Copyright (c) 2008, Three Dub Media (threedubmedia@gmail.com)
+ Copyright (c) 2008, Three Dub Media (http://threedubmedia.com)
Copyright (c) 2009 Brandon Aaron (http://brandonaaron.net)
+ Copyright (c) 2010 "Cowboy" Ben Alman
+ Copyright 2011, John Resig
+ Copyright 2011, The Dojo Foundation
+ Copyright (c) 2007-2009 IOLA and Ole Laursen
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal