Repository: cloudstack
Updated Branches:
  refs/heads/master fc7b2baba -> 3433eb7c0


README: Import README sections from 4.4 branch into master

We had a README file in our release branches, this commit grabs few useful
sections from that file into master's README file.

Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3433eb7c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3433eb7c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3433eb7c

Branch: refs/heads/master
Commit: 3433eb7c093289ae81e99a3bdf8fe3038aa752a3
Parents: fc7b2ba
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Authored: Tue Aug 5 17:44:08 2014 +0200
Committer: Rohit Yadav <rohit.ya...@shapeblue.com>
Committed: Tue Aug 5 17:44:08 2014 +0200

----------------------------------------------------------------------
 README.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3433eb7c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index c6f0ab3..cce22ae 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,57 @@ CloudStack survey page: 
http://cloudstack.apache.org/survey.html
 
 ## License
 
-Please see the [LICENSE](LICENSE) file included in the root directory of the 
source tree.
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, 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.
+
+Please see the [LICENSE](LICENSE) file included in the root directory
+of the source tree for extended license details.
+
+## Notice of Cryptographic Software
+
+This distribution includes cryptographic software. The country in which you 
currently
+reside may have restrictions on the import, possession, use, and/or re-export 
to another
+country, of encryption software. BEFORE using any encryption software, please 
check your
+country's laws, regulations and policies concerning the import, possession, or 
use, and
+re-export of encryption software, to see if this is permitted. See 
http://www.wassenaar.org/
+for more information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and Security 
(BIS), has
+classified this software as Export Commodity Control Number (ECCN) 5D002.C.1, 
which
+includes information security software using or performing cryptographic 
functions with
+asymmetric algorithms. The form and manner of this Apache Software Foundation 
distribution
+makes it eligible for export under the License Exception ENC Technology 
Software
+Unrestricted (TSU) exception (see the BIS Export Administration Regulations, 
Section
+740.13) for both object code and source code.
+
+The following provides more details on the included cryptographic software:
+
+  CloudStack makes use of JaSypt cryptographic libraries
+
+  CloudStack has a system requirement of MySQL, and uses native database 
encryption
+  functionality.
+
+  CloudStack makes use of the Bouncy Castle general-purpose encryption library.
+
+  CloudStack can optionally interacts with and controls OpenSwan-based VPNs.
+
+  CloudStack has a dependency on Apache WSS4J as part of the AWSAPI 
implementation.
+
+  CloudStack has a dependency on and makes use of JSch - a java SSH2 
implementation.
 
 ## Downloading
 
@@ -97,6 +147,13 @@ several communications channels, the mailing lists are the 
most active and the
 official channels for making decisions about the project itself.
 
 Mailing lists:
+- [Development Mailing List](mailto:dev-subscr...@cloudstack.apache.org)
+- [Users Mailing List](mailto:users-subscr...@cloudstack.apache.org)
+- [Commits Mailing List](mailto:commits-subscr...@cloudstack.apache.org)
+- [Issues Mailing List](mailto:issues-subscr...@cloudstack.apache.org)
+- [Marketing Mailing List](mailto:marketing-subscr...@cloudstack.apache.org)
+
+For more details on mailing lists subscription and usage, please visit:
 http://cloudstack.apache.org/mailing-lists.html
 
 IRC, join us on irc.freenode.net on:
@@ -110,7 +167,7 @@ https://issues.apache.org/jira/browse/CLOUDSTACK
 Developer resources:
 http://cloudstack.apache.org/developers.html
 
-For more details please see our contributing page:
+Please see our contributing page for more details:
 http://cloudstack.apache.org/contribute.html
 
 ## News and Events

Reply via email to