Updating LICENSE AND NOTICE
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/43ef7ef4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/43ef7ef4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/43ef7ef4 Branch: refs/heads/marvin Commit: 43ef7ef4730d084d8f5f4b542ba029339b2b80b4 Parents: e812b75 Author: David Nalley <[email protected]> Authored: Thu Apr 3 13:35:19 2014 -0400 Committer: David Nalley <[email protected]> Committed: Thu Apr 3 17:10:01 2014 -0400 ---------------------------------------------------------------------- LICENSE | 32 -------------------------------- NOTICE | 3 ++- 2 files changed, 2 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43ef7ef4/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 23e2586..497323b 100644 --- a/LICENSE +++ b/LICENSE @@ -207,38 +207,6 @@ Within the console-proxy/js directory from John Resig jquery.js -Within the deps directory - licensed under the BSD (2-clause) for XenServerJava http://www.opensource.org/licenses/BSD-2-Clause (as follows) - - Copyright (c) Citrix Systems, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - 1) Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2) Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - from Citrix Systems, Inc http://www.citrix.com/ - XenServerJava from http://community.citrix.com/cdn/xs/sdks/ Within the patches/systemvm/debian/config/etc directory placed in the public domain http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43ef7ef4/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index d36048a..a74c0dc 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,5 @@ - +Apache CloudStack +Copyright 2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
