aboutsummaryrefslogtreecommitdiffstats
path: root/docs/release/index.rst
AgeCommit message (Collapse)AuthorFilesLines
2017-03-30Remove numbering in docsUlas Kozat1-1/+0
Change-Id: I76c8a089e84b8362cefa752c9abc20d4b0298805 Signed-off-by: Ulas Kozat <ulas.kozat@gmail.com> (cherry picked from commit 64b4f3e3ca659762ebb9453d1128b61ef311f27a)
2017-03-30bring danube branch up to date with masteragardner1-0/+20
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 <agardner@linuxfoundation.org>