Skip to content

Commit

Permalink
Merge branch 'master' into iam-updates
Browse files Browse the repository at this point in the history
Conflicts:
	CHANGELOG.md
  • Loading branch information
jeremeamia committed Jul 16, 2014
2 parents 6af4d69 + dffe50b commit a470a77
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ CHANGELOG
Next Release:
-------------

* Added support for credential reports and password rotation policies to the
* Added support for credential reports and password rotation features to the
AWS IAM client.
* Added the `ap-northeast-1`, `ap-southeast-1`, and `ap-southeast-2` regions to
the Amazon Kinesis client.
* Added a `listFilter` stream context option that can be used when using
`opendir()` and the Amazon S3 stream wrapper. This option is used to filter
out specific objects from the files yielded from the stream wrapper.
Expand Down
15 changes: 15 additions & 0 deletions src/Aws/Kinesis/Resources/kinesis-2013-12-02.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,21 @@
'https' => true,
'hostname' => 'kinesis.eu-west-1.amazonaws.com',
),
'ap-northeast-1' => array(
'http' => false,
'https' => true,
'hostname' => 'kinesis.ap-northeast-1.amazonaws.com',
),
'ap-southeast-1' => array(
'http' => false,
'https' => true,
'hostname' => 'kinesis.ap-southeast-1.amazonaws.com',
),
'ap-southeast-2' => array(
'http' => false,
'https' => true,
'hostname' => 'kinesis.ap-southeast-2.amazonaws.com',
),
),
'operations' => array(
'CreateStream' => array(
Expand Down

0 comments on commit a470a77

Please sign in to comment.