fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/xmrig/master'

Browse source 
Conflicts:
	CHANGELOG.md
	src/version.h
This commit is contained in:
BenDr0id 2017-10-25 14:14:05 +02:00
commit eda12de623
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/net/Client.cpp
View file

@ -220,7 +220,10 @@ bool Client::parseJob(const rapidjson::Value &params, int *code)
} }
if (m_job == job) { if (m_job == job) {
LOG_WARN("[%s:%u] duplicate job received, reconnect", m_url.host(), m_url.port()); if (!m_quiet) {
LOG_WARN("[%s:%u] duplicate job received, reconnect", m_url.host(), m_url.port());
}
close(); close();
return false; return false;
} }

2
src/version.h
View file

@ -42,7 +42,7 @@
#define APP_VER_MAJOR 2 #define APP_VER_MAJOR 2
#define APP_VER_MINOR 4 #define APP_VER_MINOR 4
#define APP_VER_BUILD 1 #define APP_VER_BUILD 2
#define APP_VER_REV 0 #define APP_VER_REV 0
#ifdef _MSC_VER #ifdef _MSC_VER