Skip to content

Commit 6494dde

Browse files
committed
Merge branch 'master' into alexwoo/max_in_flight_s3
2 parents 46bcf64 + df92653 commit 6494dde

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,6 +1129,15 @@
11291129
"contributions": [
11301130
"doc"
11311131
]
1132+
},
1133+
{
1134+
"login": "salmanmkc",
1135+
"name": "Salman Chishti",
1136+
"avatar_url": "https://avatars.githubusercontent.com/u/32169182?v=4",
1137+
"profile": "https://github.com/salmanmkc",
1138+
"contributions": [
1139+
"maintenance"
1140+
]
11321141
}
11331142
],
11341143
"contributorsPerLine": 7,

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Maven](https://img.shields.io/maven-central/v/software.amazon.awssdk/s3.svg?label=Maven)](https://search.maven.org/search?q=g:%22software.amazon.awssdk%22%20AND%20a:%22s3%22)
44
[![codecov](https://codecov.io/gh/aws/aws-sdk-java-v2/branch/master/graph/badge.svg)](https://codecov.io/gh/aws/aws-sdk-java-v2)
55
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
6-
[![All Contributors](https://img.shields.io/badge/all_contributors-124-orange.svg?style=flat-square)](#contributors-)
6+
[![All Contributors](https://img.shields.io/badge/all_contributors-125-orange.svg?style=flat-square)](#contributors-)
77
<!-- ALL-CONTRIBUTORS-BADGE:END -->
88

99
The **AWS SDK for Java 2.0** is a rewrite of 1.0 with some great new features. As with version 1.0,
@@ -350,6 +350,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
350350
<td align="center" valign="top" width="14.28%"><a href="https://github.com/carhaz"><img src="https://avatars.githubusercontent.com/u/236483641?v=4?s=100" width="100px;" alt="carhaz"/><br /><sub><b>carhaz</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=carhaz" title="Code">💻</a></td>
351351
<td align="center" valign="top" width="14.28%"><a href="https://github.com/akhilyendluri"><img src="https://avatars.githubusercontent.com/u/13486835?v=4?s=100" width="100px;" alt="Akhil Yendluri"/><br /><sub><b>Akhil Yendluri</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=akhilyendluri" title="Code">💻</a></td>
352352
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ryanyuan"><img src="https://avatars.githubusercontent.com/u/7124535?v=4?s=100" width="100px;" alt="Ryan Yuan"/><br /><sub><b>Ryan Yuan</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=ryanyuan" title="Documentation">📖</a></td>
353+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/salmanmkc"><img src="https://avatars.githubusercontent.com/u/32169182?v=4?s=100" width="100px;" alt="Salman Chishti"/><br /><sub><b>Salman Chishti</b></sub></a><br /><a href="#maintenance-salmanmkc" title="Maintenance">🚧</a></td>
353354
</tr>
354355
</tbody>
355356
</table>

0 commit comments

Comments
 (0)