Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203960
Change subject: Merge remote-tracking branch 'wikimedia/upstream' into debian
......................................................................
Merge remote-tracking branch 'wikimedia/upstream' into debian
Conflicts:
.gitreview
Change-Id: I0f11d83134217f890e8ebe86d5c969035de0090f
---
M .gitreview
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/nodepool
refs/changes/60/203960/1
diff --git a/.gitreview b/.gitreview
index 3ef5f3b..24a97ea 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,12 +1,6 @@
[gerrit]
-<<<<<<< HEAD (efdfb0 Add .gitreview for Wikimedia repository)
host=gerrit.wikimedia.org
port=29418
project=operations/debs/nodepool
defaultbranch=debian
defaultrebase=0
-=======
-host=review.openstack.org
-port=29418
-project=openstack-infra/nodepool.git
->>>>>>> BRANCH (ddd600 Merge "Add support for requsting that config drive be
used.")
--
To view, visit https://gerrit.wikimedia.org/r/203960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f11d83134217f890e8ebe86d5c969035de0090f
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/nodepool
Gerrit-Branch: debian
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
