Skip to content

Commit d31cd77

Browse files
committed
Merge branch 'develop' into feature-major-release
2 parents 721f30c + 0c65ace commit d31cd77

File tree

4 files changed

+31
-3
lines changed

4 files changed

+31
-3
lines changed

.pre-commit-config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- repo: [email protected]:Whitewater/whitewater-detect-secrets
2+
rev: master
3+
hooks:
4+
- id: detect-secrets # pragma: whitelist secret
5+
args: [--baseline, .secrets.baseline, --no-keyword-scan ]

.secrets.baseline

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"exclude_regex": null,
3+
"generated_at": "2019-01-08T20:20:54Z",
4+
"plugins_used": [
5+
{
6+
"base64_limit": 4.5,
7+
"name": "Base64HighEntropyString"
8+
},
9+
{
10+
"name": "BasicAuthDetector"
11+
},
12+
{
13+
"hex_limit": 3,
14+
"name": "HexHighEntropyString"
15+
},
16+
{
17+
"name": "PrivateKeyDetector"
18+
},
19+
{
20+
"name": "SlackDetector"
21+
}
22+
],
23+
"results": {},
24+
"version": "0.10.3"
25+
}

Assistant/v2/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Assistant V2
22

3-
**Watson Assistant v2 API is released in beta. For details, see the ["Introducing Watson Assistant"](https://www.ibm.com/blogs/watson/2018/03/the-future-of-watson-conversation-watson-assistant/) blog post.**
4-
53
The IBM Watson™ [Assistant][assistant] service combines machine learning, natural language understanding, and integrated dialog tools to create conversation flows between your apps and your users.
64

75
## Usage

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The credentials for each service contain either a `username`, `password` and end
6767
## Watson Services
6868
To get started with the Watson Services in Unity, click on each service below to read through each of their `README.md`'s and their codes.
6969
* [Assistant V1](/Scripts/Services/Assistant/v1)
70-
* [Assistant V2](/Scripts/Services/Assistant/v2) (private beta)
70+
* [Assistant V2](/Scripts/Services/Assistant/v2)
7171
* [Compare Comply V1](/Scripts/Services/CompareComply/v1)
7272
* [Conversation](/Scripts/Services/Conversation/v1) (deprecated - Use Assistant V1 or Assistant V2)
7373
* [Discovery](/Scripts/Services/Discovery/v1)

0 commit comments

Comments
 (0)