diff options
| author | Russell Dempsey <sgtpooki@gmail.com> | 2015-02-28 08:54:13 -0600 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2015-02-28 17:05:15 +0100 |
| commit | 7887e119ed25f5c6fe7e3ff923452ee1af1efe59 (patch) | |
| tree | effb070f394d6507aa3f18256f2cc0741cc0aef9 /src/res | |
| parent | 755461219d6b60361d1b725833e5356e681d2ca3 (diff) | |
| download | android-node-v8-7887e119ed25f5c6fe7e3ff923452ee1af1efe59.tar.gz android-node-v8-7887e119ed25f5c6fe7e3ff923452ee1af1efe59.tar.bz2 android-node-v8-7887e119ed25f5c6fe7e3ff923452ee1af1efe59.zip | |
install: new performance counters provider guid
The io.js performance counters manifest conflicts with the one from
node, causing installer failures. Change the GUID in the io.js
performance counters manifest file to resolve the conflicts.
Fixes: https://github.com/iojs/io.js/issues/524
PR: https://github.com/iojs/io.js/pull/1001
Reviewed-by: Bert Belder <bertbelder@gmail.com>
Diffstat (limited to 'src/res')
| -rw-r--r-- | src/res/node_perfctr_provider.man | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/res/node_perfctr_provider.man b/src/res/node_perfctr_provider.man index 8c270e33d0..be878148c2 100644 --- a/src/res/node_perfctr_provider.man +++ b/src/res/node_perfctr_provider.man @@ -8,7 +8,7 @@ <provider symbol="NodeCounterProvider" applicationIdentity="iojs.exe" providerType="userMode" - providerGuid="{1E2E15D7-3760-470E-8699-B9DB5248EDD5}"> + providerGuid="{793C9B44-3D6B-4F57-B5D7-4FF80ADCF9A2}"> <counterSet symbol="NodeCounterSet" guid="{3A22A8EC-297C-48AC-AB15-33EC93033FD8}" uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet" |