Revert "Merge and close PR #43" This reverts commit f6b5e90f09ec6eee622e62dc8a97ef94eda19fd7, reversing changes made to 35dce9b92bc92d3221c2142f73b6ab8d04132e5e.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/78b0196c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/78b0196c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/78b0196c Branch: refs/heads/0.7.0-incubating Commit: 78b0196ca005c53f1876dedfbc557f01e8674b8d Parents: d0b28fc Author: Richard Downer <[email protected]> Authored: Wed Jul 9 14:30:38 2014 +0100 Committer: Richard Downer <[email protected]> Committed: Wed Jul 9 14:30:38 2014 +0100 ---------------------------------------------------------------------- README.md | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn/blob/78b0196c/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index f7b4164..961c716 100644 --- a/README.md +++ b/README.md @@ -68,20 +68,16 @@ See the [full guide to contributing](http://brooklyncentral.github.com/dev/how-t Thanks! ----- -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. + +## 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. +
