From 7046a6de49a0b3cf0e234319a029a5032ea1f984 Mon Sep 17 00:00:00 2001 From: agardner Date: Thu, 30 Mar 2017 15:16:55 -0400 Subject: 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 --- docs/submodules/domino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/submodules') diff --git a/docs/submodules/domino b/docs/submodules/domino index 6c3c84ccb..6c80ac7ca 160000 --- a/docs/submodules/domino +++ b/docs/submodules/domino @@ -1 +1 @@ -Subproject commit 6c3c84ccb889bac0a2581e10bff88e5639f64c55 +Subproject commit 6c80ac7ca497424ec867c86e43159b3e7f5800c0 -- cgit 1.2.3-korg