You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:31:24 UTC
[03/32] brooklyn git commit: Updated various files following PR
comments
Updated various files following PR comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/d0b28fc1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/d0b28fc1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/d0b28fc1
Branch: refs/heads/0.7.0-incubating
Commit: d0b28fc1be64efc8bd442be3edfc5413e5479a35
Parents: 4e2e24b
Author: Martin Harris <gi...@nakomis.com>
Authored: Fri Jul 4 13:17:45 2014 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Fri Jul 4 13:39:18 2014 +0100
----------------------------------------------------------------------
README.md | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn/blob/d0b28fc1/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 961c716..f7b4164 100644
--- a/README.md
+++ b/README.md
@@ -68,16 +68,20 @@ See the [full guide to contributing](http://brooklyncentral.github.com/dev/how-t
Thanks!
-
-## Copyright and License
-
-© 2011 - 2013 Cloudsoft Corporation Limited.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. The licence is provided in LICENSE.md, and 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.
-
-brooklyn is a registered trademark of Cloudsoft Corporation.
-
+----
+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.