Revert "Revert "Merge and close PR #43"" This reverts commit b03200dbfc9acb5030633d7cd4326a50f2c3918a.
Re-open #43 Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/6733d594 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/6733d594 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/6733d594 Branch: refs/heads/0.7.0-incubating Commit: 6733d5944f8fc64d3a8be9638925ad70ec592247 Parents: 78b0196 Author: Andrew Kennedy <[email protected]> Authored: Wed Jul 9 14:58:06 2014 +0100 Committer: Andrew Kennedy <[email protected]> Committed: Wed Jul 9 14:58:06 2014 +0100 ---------------------------------------------------------------------- README.md | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn/blob/6733d594/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.
