Ppchelko has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374854 )
Change subject: Update change-propagation to 26c2562
......................................................................
Update change-propagation to 26c2562
List of changes:
c41c813 Don't attempt to deduplicate reties
21e85b4 Added proper imports to rule executor
dcfd7cc Reuse messageKey variable
xxxxxxx Update node module dependencies
Change-Id: Ib50d9532ad478bc7afbaa2617ec351839591d6f7
---
M node_modules/kad/package.json
M node_modules/nan/nan.h
M node_modules/nan/nan_converters.h
M node_modules/nan/nan_maybe_pre_43_inl.h
M node_modules/nan/package.json
M node_modules/swagger-ui/package.json
M src
7 files changed, 30 insertions(+), 23 deletions(-)
Approvals:
Ppchelko: Verified; Looks good to me, approved
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 0ebc13c..9e21cef 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
"/limitation"
],
"_resolved":
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";,
- "_shasum": "d0cb1dd64ac6126aa2c2c885a20408f50f8aaf18",
+ "_shasum": "4d23194f1fcc9806e1723d335504c54646ecea86",
"_shrinkwrap": null,
"_spec": "kad@git+https://github.com/gwicke/kad.git#master";,
"_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/nan/nan.h b/node_modules/nan/nan.h
index 80a918a..ffbf960 100644
--- a/node_modules/nan/nan.h
+++ b/node_modules/nan/nan.h
@@ -13,7 +13,7 @@
*
* MIT License <https://github.com/nodejs/nan/blob/master/LICENSE.md>
*
- * Version 2.6.2: current Node 7.9.0, Node 12: 0.12.18, Node 10: 0.10.48,
iojs: 3.3.1
+ * Version 2.7.0: current Node 8.4.0, Node 12: 0.12.18, Node 10: 0.10.48,
iojs: 3.3.1
*
* See https://github.com/nodejs/nan for the latest update to this file
**********************************************************************************/
@@ -1650,8 +1650,8 @@
uv_async_send(that_->async);
}
- void Send(const T* data, size_t size) const {
- that_->SendProgress_(data, size);
+ void Send(const T* data, size_t count) const {
+ that_->SendProgress_(data, count);
}
private:
@@ -1673,17 +1673,17 @@
Execute(progress);
}
- void SendProgress_(const T *data, size_t size) {
- T *new_data = new T[size];
+ void SendProgress_(const T *data, size_t count) {
+ T *new_data = new T[count];
{
T *it = new_data;
- std::copy(data, data + size, it);
+ std::copy(data, data + count, it);
}
uv_mutex_lock(&async_lock);
T *old_data = asyncdata_;
asyncdata_ = new_data;
- asyncsize_ = size;
+ asyncsize_ = count;
uv_mutex_unlock(&async_lock);
delete[] old_data;
diff --git a/node_modules/nan/nan_converters.h
b/node_modules/nan/nan_converters.h
index 9dbd1ec..8a569b5 100644
--- a/node_modules/nan/nan_converters.h
+++ b/node_modules/nan/nan_converters.h
@@ -17,6 +17,14 @@
template<typename T> struct ToFactory;
+template<>
+struct ToFactory<v8::Function> : ToFactoryBase<v8::Function> {
+ static inline return_t convert(v8::Local<v8::Value> val) {
+ if (val.IsEmpty() || !val->IsFunction()) return MaybeLocal<v8::Function>();
+ return MaybeLocal<v8::Function>(val.As<v8::Function>());
+ }
+};
+
#define X(TYPE)
\
template<>
\
struct ToFactory<v8::TYPE> : ToFactoryBase<v8::TYPE> {
\
diff --git a/node_modules/nan/nan_maybe_pre_43_inl.h
b/node_modules/nan/nan_maybe_pre_43_inl.h
index d47181e..f0248f9 100644
--- a/node_modules/nan/nan_maybe_pre_43_inl.h
+++ b/node_modules/nan/nan_maybe_pre_43_inl.h
@@ -41,7 +41,7 @@
template<typename S>
inline v8::Local<S> FromMaybe(v8::Local<S> default_value) const {
- return IsEmpty() ? default_value : val_;
+ return IsEmpty() ? default_value : v8::Local<S>(val_);
}
private:
diff --git a/node_modules/nan/package.json b/node_modules/nan/package.json
index 339e01f..3a577c6 100644
--- a/node_modules/nan/package.json
+++ b/node_modules/nan/package.json
@@ -14,19 +14,19 @@
]
],
"_from": "nan@>=2.0.0 <3.0.0",
- "_id": "[email protected]",
+ "_id": "[email protected]",
"_inCache": true,
"_location": "/nan",
- "_nodeVersion": "7.5.0",
+ "_nodeVersion": "6.11.0",
"_npmOperationalInternal": {
- "host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/nan-2.6.2.tgz_1492029516320_0.2352329883724451"
+ "host": "s3://npm-registry-packages",
+ "tmp": "tmp/nan-2.7.0.tgz_1504053769999_0.18853025324642658"
},
"_npmUser": {
"name": "kkoopa",
"email": "[email protected]"
},
- "_npmVersion": "4.1.2",
+ "_npmVersion": "3.10.10",
"_phantomChildren": {},
"_requested": {
"raw": "[email protected]",
@@ -41,8 +41,8 @@
"/dtrace-provider",
"/node-rdkafka"
],
- "_resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";,
- "_shasum": "e4ff34e6c95fdfb5aecc08de6596f43605a7db45",
+ "_resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz";,
+ "_shasum": "d95bf721ec877e08db276ed3fc6eb78f9083ad46",
"_shrinkwrap": null,
"_spec": "[email protected]",
"_where": "/opt/service/node_modules/node-rdkafka",
@@ -92,7 +92,7 @@
}
],
"dependencies": {},
- "description": "Native Abstractions for Node.js: C++ header for Node 0.8 ->
7 compatibility",
+ "description": "Native Abstractions for Node.js: C++ header for Node 0.8 ->
8 compatibility",
"devDependencies": {
"bindings": "~1.2.1",
"commander": "^2.8.1",
@@ -104,10 +104,9 @@
},
"directories": {},
"dist": {
- "shasum": "e4ff34e6c95fdfb5aecc08de6596f43605a7db45",
- "tarball": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";
+ "shasum": "d95bf721ec877e08db276ed3fc6eb78f9083ad46",
+ "tarball": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz";
},
- "gitHead": "f0b2f64c1e5317888f2e12fdefb2f105e7018552",
"homepage": "https://github.com/nodejs/nan#readme";,
"license": "MIT",
"main": "include_dirs.js",
@@ -133,5 +132,5 @@
"rebuild-tests": "node-gyp rebuild --msvs_version=2013 --directory test",
"test": "tap --gc --stderr test/js/*-test.js"
},
- "version": "2.6.2"
+ "version": "2.7.0"
}
diff --git a/node_modules/swagger-ui/package.json
b/node_modules/swagger-ui/package.json
index 2d37547..67f2878 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
"/hyperswitch"
],
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541";,
- "_shasum": "4c0953f66de580b48088be69a8a04339a0c8b7ae",
+ "_shasum": "ee262d00a0f7cdb7727d9a27efb9efdfa37c38bd",
"_shrinkwrap": null,
"_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master";,
"_where": "/opt/service/node_modules/hyperswitch",
diff --git a/src b/src
index 803222f..26c2562 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 803222f5b139c56492b7d2b94f003bff34d4a463
+Subproject commit 26c25624fe324f924a68d608fb8238fd7f6f7a5f
--
To view, visit https://gerrit.wikimedia.org/r/374854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib50d9532ad478bc7afbaa2617ec351839591d6f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko <[email protected]>
Gerrit-Reviewer: Ppchelko <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
