Skip to content

Commit

Permalink
Merge branch 'main' into security/genai/8936-other-openai
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Oct 9, 2024
2 parents decc7b3 + bd6533f commit 91b795c
Show file tree
Hide file tree
Showing 169 changed files with 2,037 additions and 10,993 deletions.
31 changes: 0 additions & 31 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,37 +74,6 @@ under a "BSD" license.

Distributed under the BSD license:

Copyright (c) 2010, Ajax.org B.V.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Ajax.org B.V. nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

---
This product includes code that is based on Ace editor, which was available
under a "BSD" license.

Distributed under the BSD license:

Copyright (c) 2010, Ajax.org B.V.
All rights reserved.

Expand Down
144 changes: 138 additions & 6 deletions oas_docs/bundle.json
Original file line number Diff line number Diff line change
Expand Up @@ -19328,6 +19328,27 @@
"description": {
"type": "string"
},
"discovery": {
"additionalProperties": true,
"properties": {
"fields": {
"items": {
"additionalProperties": true,
"properties": {
"name": {
"type": "string"
}
},
"required": [
"name"
],
"type": "object"
},
"type": "array"
}
},
"type": "object"
},
"download": {
"type": "string"
},
Expand Down Expand Up @@ -19716,7 +19737,8 @@
"type": {
"enum": [
"integration",
"input"
"input",
"content"
],
"type": "string"
},
Expand Down Expand Up @@ -19793,6 +19815,27 @@
"description": {
"type": "string"
},
"discovery": {
"additionalProperties": true,
"properties": {
"fields": {
"items": {
"additionalProperties": true,
"properties": {
"name": {
"type": "string"
}
},
"required": [
"name"
],
"type": "object"
},
"type": "array"
}
},
"type": "object"
},
"download": {
"type": "string"
},
Expand Down Expand Up @@ -20181,7 +20224,8 @@
"type": {
"enum": [
"integration",
"input"
"input",
"content"
],
"type": "string"
},
Expand Down Expand Up @@ -21769,6 +21813,27 @@
"description": {
"type": "string"
},
"discovery": {
"additionalProperties": true,
"properties": {
"fields": {
"items": {
"additionalProperties": true,
"properties": {
"name": {
"type": "string"
}
},
"required": [
"name"
],
"type": "object"
},
"type": "array"
}
},
"type": "object"
},
"download": {
"type": "string"
},
Expand Down Expand Up @@ -22197,7 +22262,8 @@
"type": {
"enum": [
"integration",
"input"
"input",
"content"
],
"type": "string"
},
Expand Down Expand Up @@ -22329,6 +22395,27 @@
"description": {
"type": "string"
},
"discovery": {
"additionalProperties": true,
"properties": {
"fields": {
"items": {
"additionalProperties": true,
"properties": {
"name": {
"type": "string"
}
},
"required": [
"name"
],
"type": "object"
},
"type": "array"
}
},
"type": "object"
},
"download": {
"type": "string"
},
Expand Down Expand Up @@ -22757,7 +22844,8 @@
"type": {
"enum": [
"integration",
"input"
"input",
"content"
],
"type": "string"
},
Expand Down Expand Up @@ -23279,6 +23367,27 @@
"description": {
"type": "string"
},
"discovery": {
"additionalProperties": true,
"properties": {
"fields": {
"items": {
"additionalProperties": true,
"properties": {
"name": {
"type": "string"
}
},
"required": [
"name"
],
"type": "object"
},
"type": "array"
}
},
"type": "object"
},
"download": {
"type": "string"
},
Expand Down Expand Up @@ -23707,7 +23816,8 @@
"type": {
"enum": [
"integration",
"input"
"input",
"content"
],
"type": "string"
},
Expand Down Expand Up @@ -23827,6 +23937,27 @@
"description": {
"type": "string"
},
"discovery": {
"additionalProperties": true,
"properties": {
"fields": {
"items": {
"additionalProperties": true,
"properties": {
"name": {
"type": "string"
}
},
"required": [
"name"
],
"type": "object"
},
"type": "array"
}
},
"type": "object"
},
"download": {
"type": "string"
},
Expand Down Expand Up @@ -24255,7 +24386,8 @@
"type": {
"enum": [
"integration",
"input"
"input",
"content"
],
"type": "string"
},
Expand Down
Loading

0 comments on commit 91b795c

Please sign in to comment.