Hashar has submitted this change and it was merged.
Change subject: Merge branch 'gerrit/attic/jjb-config/labs' into labs
......................................................................
Merge branch 'gerrit/attic/jjb-config/labs' into labs
Migrated the jjb jobs.yaml file under /jjb/ to reflect the changes made
in the master branch.
Conflicts:
.gitignore
.gitreview
Change-Id: I77466cd6689521ab1cf7024017aee485c75f0a7b
---
M .gitignore
M .gitreview
R jjb/jobs.yaml
3 files changed, 0 insertions(+), 7 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index bd1baf5..cb2209e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-<<<<<<< HEAD (fc743f Dummy tox.ini from `master` branch)
/.tox
-=======
.*.swp
->>>>>>> BRANCH (a6b496 integration-mediawiki based on Zuul cloner)
diff --git a/.gitreview b/.gitreview
index ad66403..37dc712 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,9 +1,5 @@
[gerrit]
host=gerrit.wikimedia.org
port=29418
-<<<<<<< HEAD (fc743f Dummy tox.ini from `master` branch)
project=integration/config.git
-=======
-project=integration/jenkins-job-builder-config.git
->>>>>>> BRANCH (a6b496 integration-mediawiki based on Zuul cloner)
defaultbranch=labs
diff --git a/jobs.yaml b/jjb/jobs.yaml
similarity index 100%
rename from jobs.yaml
rename to jjb/jobs.yaml
--
To view, visit https://gerrit.wikimedia.org/r/173263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77466cd6689521ab1cf7024017aee485c75f0a7b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: labs
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
