Skip to content

Commit 7570254

Browse files
committed
Merge branch 'rc-2.6.0' into develop
2 parents aa5e983 + a555af3 commit 7570254

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "IBM Watson SDK for Unity"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2.4.2
41+
PROJECT_NUMBER = 2.6.0
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

Scripts/Services/Discovery/v1/Discovery.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2553,8 +2553,8 @@ public bool Query(SuccessCallback<QueryResponse> successCallback, FailCallback f
25532553
if (!string.IsNullOrEmpty(_return))
25542554
req.Parameters["return"] = _return;
25552555

2556-
if (!string.IsNullOrEmpty(loggingOptOut)
2557-
restRequest.WithHeader("X-Watson-Logging-Opt-Out", loggingOptOut);
2556+
if (loggingOptOut != null)
2557+
req.Headers.Add("X-Watson-Logging-Opt-Out", loggingOptOut.ToString());
25582558

25592559
req.Parameters["offset"] = offset;
25602560
req.Parameters["count"] = count;

Scripts/Utilities/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static class Path
4747
public static class String
4848
{
4949
/// <exclude />
50-
public const string Version = "watson-apis-unity-sdk/2.5.0";
50+
public const string Version = "watson-apis-unity-sdk/2.6.0";
5151
/// <exclude />
5252
public const string DebugDispalyQuality = "Quality: {0}";
5353
/// <summary>

0 commit comments

Comments
 (0)