Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflicts release 1 30 #1804

Merged
merged 19 commits into from
Nov 18, 2020
Merged

Fix conflicts release 1 30 #1804

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c96cda1
Release v1.26.0 (#1680)
sriram-mv Aug 11, 2020
a081602
Update __init__.py (#1704)
mndeveci Sep 5, 2020
2ef7591
Release/v1.27.0 resolveconflict (#1717)
wchengru Sep 18, 2020
847cf92
Merge remote-tracking branch 'origin/master' into release/v1.27.0
wchengru Sep 18, 2020
68596b6
Merge branch 'release/v1.27.0'
wchengru Sep 18, 2020
a5595d6
Release/v1.28.0 (#1754) (#1756)
wchengru Oct 27, 2020
df07ee4
bump version to 1.28.1 (#1758) (#1759)
wchengru Oct 28, 2020
815b6aa
Fix merge conflict in release 1.29.0 (#1771)
hawflau Nov 5, 2020
d4d1b13
fix: Validate API request models (#1757)
prenx4x Oct 29, 2020
966785b
chore: Upgrade outdated dependencies in base.txt and dev.txt (#1744)
aahung Oct 30, 2020
b30f2e6
chore: Use Compatible release clause in requirement files (#1762)
aahung Oct 31, 2020
cacd53b
Fix: SAM Crashes Invalid swagger models exception (#1765)
prenx4x Nov 4, 2020
586c0cf
Fix: DefaultAuth not a string exception (#1774)
prenx4x Nov 6, 2020
6c5e933
Adding PermissionsBoundary property for State Machine resource (#1772)
wong-a Nov 6, 2020
06f5efb
fix: use newer policy name in gov & cn regions for xray (#1767)
mndeveci Nov 6, 2020
ced3a3b
Add Description property to Api and HttApi resources (#1719)
gruebel Nov 9, 2020
a491913
Update DEVELOPMENT_GUIDE; moved from rst to md (#1778)
hawflau Nov 10, 2020
4770c36
chore: bump version 1.30.0 (#1792)
mndeveci Nov 10, 2020
142a7a9
Merge branch 'release/v1.30.0' into fix_conflicts_release_1_30
mndeveci Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.