>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20364?usp=email )
Change subject: Merge branch 'gerrit/ionic' into 'gerrit/phoenix'
......................................................................
Merge branch 'gerrit/ionic' into 'gerrit/phoenix'
* [NO ISSUE] Add missing licenses
Ext-ref: MB-68123
Change-Id: Ifc7294134344cc3381850907e73f8fc76d2616ef
---
M
asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
M asterixdb/src/main/licenses/content/www.bouncycastle.org_licence.html.txt
3 files changed, 4 insertions(+), 16 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/64/20364/1
diff --git
a/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
b/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
index f93f2e7..236805a 100644
---
a/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
+++
b/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
@@ -18,9 +18,5 @@
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE
-<<<<<<< HEAD (eb82df Merge branch 'gerrit/ionic' into 'gerrit/phoenix')
SOFTWARE
-=======
- SOFTWARE
-
->>>>>>> BRANCH (4f0146 [NO ISSUE] Add missing licenses)
+
\ No newline at end of file
diff --git
a/asterixdb/src/main/licenses/content/www.bouncycastle.org_licence.html.txt
b/asterixdb/src/main/licenses/content/www.bouncycastle.org_licence.html.txt
index 7845ce2..e1de75a 100644
--- a/asterixdb/src/main/licenses/content/www.bouncycastle.org_licence.html.txt
+++ b/asterixdb/src/main/licenses/content/www.bouncycastle.org_licence.html.txt
@@ -1,13 +1,3 @@
-<<<<<<< HEAD (eb82df Merge branch 'gerrit/ionic' into 'gerrit/phoenix')
-BOUNCY CASTLE LICENSE
-Copyright (c) 2000 - 2024 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-=======
Copyright (c) 2000-2023 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software
@@ -25,4 +15,3 @@
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER
DEALINGS IN THE SOFTWARE.
->>>>>>> BRANCH (4f0146 [NO ISSUE] Add missing licenses)
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20364?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: phoenix
Gerrit-Change-Id: Ifc7294134344cc3381850907e73f8fc76d2616ef
Gerrit-Change-Number: 20364
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
