Merge branch 'develop' into cloudsearch2-proxy

Author: yuvaloren

boto/cloudsearch2/search.py

@@ -131,7 +131,7 @@ def to_params(self):
                 params['highlight.%s' % k] = v
 
         if self.options:
-            params['options'] = self.options
+            params['q.options'] = self.options
 
         if self.return_fields:
             params['return'] = ','.join(self.return_fields)

docs/source/apps_built_on_boto.rst

@@ -42,3 +42,10 @@ you'd like it listed here, please submit a `pull request`_ adding it!
     pre-configured webservers to a cluster (including updating the load
     balancer), performing automated software deployments and creating backups -
     each with just one call from the commandline.
+
+**iamer**
+    https://pypi.python.org/pypi/iamer
+    IAMer dump and load your AWS IAM configuration into text files. Once
+    dumped, you can version the resulting json and ini files to keep track of
+    changes, and even ask your team mates to do Pull Requests when they want
+    access to something.

tests/unit/cloudsearch2/test_search.py

@@ -116,11 +116,12 @@ class CloudSearchSearchTest(CloudSearchSearchBaseTest):
     def test_cloudsearch_qsearch(self):
         search = SearchConnection(endpoint=HOSTNAME)
 
-        search.search(q='Test')
+        search.search(q='Test', options='TestOptions')
 
         args = self.get_args(HTTPretty.last_request.raw_requestline)
 
         self.assertEqual(args[b'q'], [b"Test"])
+        self.assertEqual(args[b'q.options'], [b"TestOptions"])
         self.assertEqual(args[b'start'], [b"0"])
         self.assertEqual(args[b'size'], [b"10"])