summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-11 12:07:05 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-11 12:07:05 +0000
commitffdab0773f116f685bcd181a95c331d94fb8422c (patch)
tree001bb9492f36fae97cc15c7f67d77fda69f281b9
parent130f9c3be9facc3cef551c6d7781b02260f4f335 (diff)
parent6fb970627653a5ae6293db6ef36b5a836e98769d (diff)
Merge "Add & fix licensing in README.rst files, align ext"
-rw-r--r--README10
-rw-r--r--README.rst3
-rw-r--r--ci/README.rst (renamed from ci/README)12
-rw-r--r--mcp/config/scenario/README.rst (renamed from mcp/config/scenario/README.md)13
-rw-r--r--mcp/patches/README.rst (renamed from mcp/patches/README.md)4
-rw-r--r--prototypes/sfc_tacker/README.rst (renamed from prototypes/sfc_tacker/README)13
6 files changed, 20 insertions, 35 deletions
diff --git a/README b/README
deleted file mode 100644
index 4629763a3..000000000
--- a/README
+++ /dev/null
@@ -1,10 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
diff --git a/README.rst b/README.rst
new file mode 100644
index 000000000..e1b9201aa
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,3 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. SPDX-License-Identifier: CC-BY-4.0
+.. (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others.
diff --git a/ci/README b/ci/README.rst
index 898442559..9f1230dbd 100644
--- a/ci/README
+++ b/ci/README.rst
@@ -1,12 +1,6 @@
-##############################################################################
-# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea Software AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. SPDX-License-Identifier: CC-BY-4.0
+.. (c) 2017 Ericsson AB, Mirantis Inc., Enea Software AB and others.
Abstract
========
diff --git a/mcp/config/scenario/README.md b/mcp/config/scenario/README.rst
index 6ecf05f32..e0f9848ea 100644
--- a/mcp/config/scenario/README.md
+++ b/mcp/config/scenario/README.rst
@@ -1,10 +1,9 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. SPDX-License-Identifier: CC-BY-4.0
+.. (c) 2017 Mirantis Inc., Enea AB and others.
+
+Fuel@OPNFV Scenario Configuration
+=================================
Abstract:
---------
diff --git a/mcp/patches/README.md b/mcp/patches/README.rst
index eab4d64e3..81717b946 100644
--- a/mcp/patches/README.md
+++ b/mcp/patches/README.rst
@@ -1,3 +1,7 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. SPDX-License-Identifier: CC-BY-4.0
+.. (c) 2017 Mirantis Inc., Enea AB and others.
+
Fuel@OPNFV submodule fetching and patching
==========================================
diff --git a/prototypes/sfc_tacker/README b/prototypes/sfc_tacker/README.rst
index 0208b7850..27574a66f 100644
--- a/prototypes/sfc_tacker/README
+++ b/prototypes/sfc_tacker/README.rst
@@ -1,14 +1,9 @@
-# author: Ferenc Cserepkei <ferenc.cserepkei@ericsson.com>
-#
-# (c) 2016 Telefonaktiebolaget L. M. ERICSSON
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. SPDX-License-Identifier: CC-BY-4.0
+.. (c) 2016 Telefonaktiebolaget L. M. ERICSSON
README SFC + Tacker
--------------------
+===================
The Enclosed shell script builds, deploys, orchestrates Tacker,
an Open NFV Orchestrator with in-built general purpose VNF Manager