jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337380 )
Change subject: Merge remote-tracking branch 'origin/master' into es5
......................................................................
Merge remote-tracking branch 'origin/master' into es5
Change-Id: Ie2bb0948f3076b5039dbebea190cea56183de49c
---
M composer.json
M composer.lock
M composer/installed.json
3 files changed, 6 insertions(+), 17 deletions(-)
Approvals:
jenkins-bot: Verified
DCausse: Looks good to me, approved
diff --git a/composer.json b/composer.json
index 4b66855..74d5c5e 100644
--- a/composer.json
+++ b/composer.json
@@ -53,13 +53,8 @@
"pear/pear_exception": "1.0.0",
"php": ">=5.5.9",
"pimple/pimple": "2.1.1",
-<<<<<<< HEAD (2b02ba Merge remote-tracking branch 'origin/master' into es5)
- "psr/log": "1.0.0",
"ruflin/elastica": "5.0.0",
-=======
"psr/log": "1.0.2",
- "ruflin/elastica": "3.1.1",
->>>>>>> BRANCH (8d7469 Update psr/log to v1.0.2)
"stil/gd-text": "1.0.0",
"symfony/process": "3.0.4",
"wikimedia/assert": "0.2.2",
diff --git a/composer.lock b/composer.lock
index 31fb2c6..da472e2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,13 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-<<<<<<< HEAD (2b02ba Merge remote-tracking branch 'origin/master' into es5)
- "hash": "2495141eeac39e9e268b524a745678ab",
- "content-hash": "b114a34b5b4875a17a768384823087c7",
-=======
- "hash": "bd584c21af40cc628648796b0ccf8e91",
- "content-hash": "008b82e482b471745b498860c2e038b4",
->>>>>>> BRANCH (8d7469 Update psr/log to v1.0.2)
+ "hash": "d0cf7e4112675e807d79308cfe153819",
+ "content-hash": "6ca997834f6157671342f012fa44da6a",
"packages": [
{
"name": "composer/semver",
@@ -1125,7 +1120,7 @@
"dist": {
"type": "zip",
"url": "https://github.com/ruflin/Elastica/archive/5.0.0.zip";,
- "reference": null,
+ "reference": "tags/5.0.0",
"shasum": null
},
"type": "library",
diff --git a/composer/installed.json b/composer/installed.json
index 91ee297..96f5e41 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1917,7 +1917,6 @@
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";
},
{
-<<<<<<< HEAD (2b02ba Merge remote-tracking branch 'origin/master' into es5)
"name": "ruflin/elastica",
"version": "5.0.0",
"version_normalized": "5.0.0.0",
@@ -1929,7 +1928,7 @@
"dist": {
"type": "zip",
"url": "https://github.com/ruflin/Elastica/archive/5.0.0.zip";,
- "reference": null,
+ "reference": "tags/5.0.0",
"shasum": null
},
"type": "library",
@@ -1939,7 +1938,8 @@
"Elastica\\": "lib/Elastica/"
}
}
-=======
+ },
+ {
"name": "cssjanus/cssjanus",
"version": "v1.1.3",
"version_normalized": "1.1.3.0",
@@ -2062,6 +2062,5 @@
"psr",
"psr-3"
]
->>>>>>> BRANCH (8d7469 Update psr/log to v1.0.2)
}
]
--
To view, visit https://gerrit.wikimedia.org/r/337380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2bb0948f3076b5039dbebea190cea56183de49c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: es5
Gerrit-Owner: DCausse <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
