Mark some patches as merged upstream
This commit is contained in:
parent
4b9792d860
commit
f4fd8ee1e8
|
|
@ -3,6 +3,7 @@ Date: Mon, 25 Apr 2016 12:50:32 +0100
|
||||||
Subject: test-parent: this test requires user xattrs
|
Subject: test-parent: this test requires user xattrs
|
||||||
|
|
||||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||||
|
Applied-upstream: 2016.6, commit:542df553e2c51a9d2f9cfc4212dfd996f54b3f8b
|
||||||
---
|
---
|
||||||
tests/test-parent.sh | 2 ++
|
tests/test-parent.sh | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ fails as soon as something goes wrong.
|
||||||
|
|
||||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||||
Forwarded: https://github.com/ostreedev/ostree/pull/335
|
Forwarded: https://github.com/ostreedev/ostree/pull/335
|
||||||
|
Applied-upstream: 2016.6, commit:0cf0fa815414eebb3e642429085fa75dda05c24d
|
||||||
---
|
---
|
||||||
tests/test-sysroot.js | 2 +-
|
tests/test-sysroot.js | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue