X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-merge-master;h=5fafbace5ae02cbf72e755e9d0c032c69ae8b397;hb=refs%2Fchanges%2F89%2F8389%2F1;hp=47cd9fdb4a6bf01fc90c97abe048c41969c89bf1;hpb=bb5e0da850b1c5ed31cf76af62d91b506c13d8dd;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-maven-maven-merge-master b/.jjb-test/expected-xml/github-maven-maven-merge-master
index 47cd9fdb..5fafbace 100644
--- a/.jjb-test/expected-xml/github-maven-maven-merge-master
+++ b/.jjb-test/expected-xml/github-maven-maven-merge-master
@@ -10,8 +10,9 @@
build-vm
false
-
+
$GIT_URL/$PROJECT/example-org/releng/ciman
+
@@ -120,28 +121,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
master
-
-
false
- false
- true
- false
false
Default
-
- true
-
- false
- false
+
+
+
false
true
false
+ false
10
@@ -155,8 +150,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
false
+
+
^remerge$
+
false
true
true
@@ -512,11 +510,11 @@ exit 0
false
-
+
**/**.exec
**/classes
**/src/main/java
-
+ false
**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**
10