merge with master fixes

This commit is contained in:
Manuel Araoz 2015-03-20 15:19:25 -03:00
parent 76af2d1314
commit 9f91bbfbc9
2 changed files with 2 additions and 1 deletions

View File

@ -6,7 +6,7 @@ BitcoreNode:
Reporter: none # none, simple, matrix
LevelUp: ./db
RPC:
user: username
user: user
pass: password
protocol: http
host: 127.0.0.1

View File

@ -66,6 +66,7 @@ NetworkMonitor.prototype.start = function() {
this.peer.connect();
};
NetworkMonitor.prototype.stop = function(reason) {
console.trace();
this.peer.disconnect();
if (reason) {
throw reason;