From 6c80ac7ca497424ec867c86e43159b3e7f5800c0 Mon Sep 17 00:00:00 2001 From: agardner Date: Thu, 30 Mar 2017 15:16:55 -0400 Subject: bring danube branch up to date with master Gerrit doesn't like merge commits eg: this wont work git merge origin/master --no-commit git commit -sv git review stable/danube So I took the diff git diff origin/stable/danube..master and checked out the files that were changed git checkout origin/master -- featureconfig.rst normally you should checkout the change sets and resolve the merge conflitcs, but in this case we dont care. Change-Id: I2a02e8ae7237825911f22663a5c65cdb9f5c5e4f Signed-off-by: agardner --- docs/release/userguide/feature.userguide.rst | 1 + docs/release/userguide/index.rst | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'docs/release/userguide') diff --git a/docs/release/userguide/feature.userguide.rst b/docs/release/userguide/feature.userguide.rst index 6187a22..8705a77 100644 --- a/docs/release/userguide/feature.userguide.rst +++ b/docs/release/userguide/feature.userguide.rst @@ -1,5 +1,6 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 +.. (c) 2017 OPNFV ======================================== Domino API Usage Guidelines and Examples diff --git a/docs/release/userguide/index.rst b/docs/release/userguide/index.rst index 510fb38..7372cb3 100644 --- a/docs/release/userguide/index.rst +++ b/docs/release/userguide/index.rst @@ -1,7 +1,8 @@ -.. _domino-userguide: - .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 +.. (c) 2017 OPNFV + +.. _domino-userguide: ***************** Domino User Guide -- cgit 1.2.3-korg