summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authoragardner <agardner@linuxfoundation.org>2017-03-30 15:16:55 -0400
committerGerrit Code Review <gerrit@opnfv.org>2017-03-30 19:43:11 +0000
commit7046a6de49a0b3cf0e234319a029a5032ea1f984 (patch)
tree9da47fa1747fbac6e1173388db2b1a253aa38357 /.gitmodules
parentc32ccc0cf9a5396329282390a3c89d73c45fa2a0 (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 '.gitmodules')
0 files changed, 0 insertions, 0 deletions