Skip to content

Commit

Permalink
Merge pull request #2697 from atlanhq/accesscontrolv2-merge-helper
Browse files Browse the repository at this point in the history
Merge master into accesscontrolv2
  • Loading branch information
nikhilbonte21 authored Dec 22, 2023
2 parents 5758677 + 8e65fb2 commit 83ac5e8
Show file tree
Hide file tree
Showing 29 changed files with 622 additions and 83 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ jobs:
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
id: get_branch

- name: Create Maven Settings
uses: s4u/[email protected]
with:
servers: |
[{
"id": "github",
"username": "atlan-ci",
"password": "${{ secrets.my_pat }}"
}]
- name: Build with Maven
run: |
branch_name=${{ steps.get_branch.outputs.branch }}
Expand Down
2 changes: 1 addition & 1 deletion addons/elasticsearch/es-settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"mapping" : {
"total_fields" : {
"limit" : "2000"
"limit" : "5000"
},
"nested_objects" : {
"limit" : "100000"
Expand Down
Loading

0 comments on commit 83ac5e8

Please sign in to comment.