diff options
author | 2017-03-30 15:16:55 -0400 | |
---|---|---|
committer | 2017-03-30 15:20:57 -0400 | |
commit | 6c80ac7ca497424ec867c86e43159b3e7f5800c0 (patch) | |
tree | b6fdb91d72b96943e31303d37a8ce8d939282503 /docs/userguide/.api-documentation.rst.swp | |
parent | 6c3c84ccb889bac0a2581e10bff88e5639f64c55 (diff) |
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 <agardner@linuxfoundation.org>
Diffstat (limited to 'docs/userguide/.api-documentation.rst.swp')
0 files changed, 0 insertions, 0 deletions