Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:boto/boto into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@garnaat
garnaat committed Dec 4, 2012
2 parents 4086e97 + 3e1b2a7 commit cd6152f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions boto/sns/connection.py
View file
Expand Up @@ -255,7 +255,7 @@ def subscribe(self, topic, protocol, endpoint):
Subscribe to a Topic. Subscribe to a Topic.
:type topic: string :type topic: string
:param topic: The name of the new topic. :param topic: The ARN of the new topic.
:type protocol: string :type protocol: string
:param protocol: The protocol used to communicate with :param protocol: The protocol used to communicate with
Expand Down Expand Up @@ -302,7 +302,7 @@ def subscribe_sqs_queue(self, topic, queue):
that policy. If no policy exists, a new policy will be created. that policy. If no policy exists, a new policy will be created.
:type topic: string :type topic: string
:param topic: The name of the new topic. :param topic: The ARN of the new topic.
:type queue: A boto Queue object :type queue: A boto Queue object
:param queue: The queue you wish to subscribe to the SNS Topic. :param queue: The queue you wish to subscribe to the SNS Topic.
Expand Down

0 comments on commit cd6152f

Please sign in to comment.