From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Mon, 8 Oct 2012 08:33:25 +0000 (+0200)
Subject: Merge branch 'master' of git.icinga.org:icinga2
X-Git-Tag: v0.0.1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c63a9da3268782e6607ba0bb87ef69e4f4f5bd10;p=icinga2

Merge branch 'master' of git.icinga.org:icinga2

Conflicts:
	components/compatido/compatidocomponent.cpp
---

c63a9da3268782e6607ba0bb87ef69e4f4f5bd10
diff --cc components/compatido/compatidocomponent.cpp
index 0a06f4715,badffc162..e5954bc92
--- a/components/compatido/compatidocomponent.cpp
+++ b/components/compatido/compatidocomponent.cpp
@@@ -311,12 -298,12 +315,12 @@@ void CompatIdoComponent::SendHello(Stri
  	stringstream message;
  	message << "\n\n"
  		<< "HELLO" << "\n"
 -		<< "PROTOCOL" << ": " << 2 << "\n"
 -		<< "AGENT" << ": " << "I2 COMPATIDO" << "\n"
 +		<< "PROTOCOL" << ": " << COMPATIDO_PROTOCOL<< "\n"
 +		<< "AGENT" << ": " << COMPATIDO_NAME << "\n"
- 		<< "AGENTVERSION" << ": " << COMPATIDO_RELEASE_VERSION << "\n"
+ 		<< "AGENTVERSION" << ": " << VERSION << "\n"
  		<< "STARTTIME" << ": " << static_cast<int>(Utility::GetTime()) << "\n"
  		<< "DISPOSITION" << ": " << "REALTIME" << "\n"
 -		<< "CONNECTION" << ": " << "TCPSOCKET" << "\n"
 +		<< "CONNECTION" << ": " << connection << "\n"
  		<< "INSTANCENAME" << ": " << instancename << "\n"
  		<< "STARTDATADUMP"
  		<< "\n\n";