[icinga-checkins] icinga.org: icinga2/feature/check_nscp-12874: Merge Branch master

git at icinga.org git at icinga.org
Thu Dec 8 14:14:39 CET 2016


Module: icinga2
Branch: feature/check_nscp-12874
Commit: f48f3a6f1ef53649c119e58320ef036eb3a34752
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=f48f3a6f1ef53649c119e58320ef036eb3a34752

Author: Jean Flach <jean-marcel.flach at netways.de>
Date:   Fri Oct 14 15:41:52 2016 +0200

Merge Branch master

---

 lib/remote/url.cpp |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/remote/url.cpp b/lib/remote/url.cpp
index e91cba9..dfe5e24 100644
--- a/lib/remote/url.cpp
+++ b/lib/remote/url.cpp
@@ -386,11 +386,7 @@ bool Url::ParseQuery(const String& query)
 		String key = token.SubStr(0, pHelper);
 		String value = Empty;
 
-<<<<<<< HEAD
 		if (pHelper != String::NPos && pHelper != token.GetLength() - 1)
-=======
-		if (pHelper != token.NPos && pHelper != token.GetLength() - 1)
->>>>>>> Fix Url query without values
 			value = token.SubStr(pHelper+1);
 
 		if (!ValidateToken(value, ACQUERY))



More information about the icinga-checkins mailing list