diff options
author | agardner <agardner@linuxfoundation.org> | 2017-03-30 15:16:55 -0400 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-03-30 19:43:11 +0000 |
commit | 7046a6de49a0b3cf0e234319a029a5032ea1f984 (patch) | |
tree | 9da47fa1747fbac6e1173388db2b1a253aa38357 /docs/submodules/domino | |
parent | c32ccc0cf9a5396329282390a3c89d73c45fa2a0 (diff) |
Update git submodules
* Update docs/submodules/domino from branch 'stable/danube'
- 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/submodules/domino')
m--------- | docs/submodules/domino | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/submodules/domino b/docs/submodules/domino -Subproject 6c3c84ccb889bac0a2581e10bff88e5639f64c5 +Subproject 6c80ac7ca497424ec867c86e43159b3e7f5800c |