Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/peeriodproject/core
Browse files Browse the repository at this point in the history
  • Loading branch information
joernroeder committed Sep 12, 2014
2 parents 66f96e2 + 0645947 commit b7608bf
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "peeriod-core",
"version": "0.1.0",
"version": "0.1.1",
"author": [
{
"name": "Jonathan Pirnay",
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion src/config/mainConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"pluginConfigName" : "plugin.json",
"pluginManagerStateConfig": "pluginManager.json",
"pluginManagerMaxFileBufferInMegaBytes": 50,
"binaryPath" : "core/plugin/pluginRunner/node_v0_10_30",
"binaryPath" : "core/plugin/pluginRunner/node_v0_10_31",
"timeoutInSeconds": 30,
"pluginRunnerChunkSize": 512,
"api" : {
Expand Down
6 changes: 3 additions & 3 deletions src/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Peeriod",
"description": "Bleeding Edge Anonymous File Sharing",
"version": "0.1.0",
"version": "0.1.1",
"versionCheckUrl": "https://peeriodproject.github.io/peeriodVersionCheck.json",
"main": "index.html",
"no-edit-menu": true,
Expand All @@ -14,7 +14,7 @@
"buffertools": "^2.1.2",
"chokidar": "^0.8.2",
"elastic.js": "^1.1.1",
"elasticsearch": "^2.4.0",
"elasticsearch": "^2.4.2",
"fs-extra": "^0.10.0",
"i18n": "^0.5.0",
"json-stable-stringify": "^1.0.0",
Expand All @@ -23,7 +23,7 @@
"node-lmdb": "^0.2.2",
"node-static": "^0.7.3",
"primus.io": "^3.1.1",
"sandcastle": "https://github.com/joernroeder/sandcastle/tarball/master",
"sandcastle": "https://github.com/joernroeder/sandcastle/tarball/memoryLeakFixing",
"stack-trace": "0.0.9",
"usage": "^0.4.12",
"usb-detection": "^1.0.3",
Expand Down
2 changes: 1 addition & 1 deletion test/core/plugin/PluginRunnerFactory.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/core/plugin/PluginRunnerFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('CORE --> PLUGIN --> PluginRunnerFactory', function () {
return 'PluginApi.js';
}
else if (key === 'plugin.binaryPath') {
return './core/plugin/pluginRunner/node_v0_10_30';
return './core/plugin/pluginRunner/node_v0_10_31';
}
}
});
Expand Down

0 comments on commit b7608bf

Please sign in to comment.