merge default into bug20284

Author: Alexandru Scvortov

README.in

@@ -1,8 +1,8 @@
-Please see http://www.rabbitmq.com/build-dotnet-client.html for build 
+Please see http://www.rabbitmq.com/build-dotnet-client.html for build
 instructions.
 
-For your convenience, a text copy of these instructions is available 
-below. Please be aware that the instructions here may not be as up to 
+For your convenience, a text copy of these instructions is available
+below. Please be aware that the instructions here may not be as up to
 date as those at the above URL.
 
 ===========================================================================

dist.sh

@@ -131,9 +131,11 @@ function dist-zips {
         "/suppress:RabbitMQ.Client.Framing.v0_8 \
          /suppress:RabbitMQ.Client.Framing.v0_8qpid \
          /suppress:RabbitMQ.Client.Framing.v0_9 \
+         /suppress:RabbitMQ.Client.Framing.v0_9_1 \
          /suppress:RabbitMQ.Client.Framing.Impl.v0_8 \
          /suppress:RabbitMQ.Client.Framing.Impl.v0_8qpid \
          /suppress:RabbitMQ.Client.Framing.Impl.v0_9 \
+         /suppress:RabbitMQ.Client.Framing.Impl.v0_9_1 \
          /suppress:RabbitMQ.Client.Impl \
          /suppress:RabbitMQ.Client.Apigen.Attributes" \
         $NAME_VSN-tmp-xmldoc.zip \

docs/specs/amqp0-8.stripped.xml

@@ -457,10 +457,18 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="delivery tag" domain="delivery tag"/>
       <field name="requeue" type="bit"/>
     </method>
-    <method name="recover" index="100">
+    <method name="recover-async" index="100">
       <chassis name="server" implement="MUST"/>
       <field name="requeue" type="bit"/>
     </method>
+    <method name="recover" synchronous="1" index="110">
+      <response name="recover-ok"/>
+      <chassis name="server" implement="MAY"/>
+      <field name="requeue" domain="bit"/>
+    </method>
+    <method name="recover-ok" index="111">
+      <chassis name="client" implement="MAY"/>
+    </method>
   </class>
   <class name="file" handler="channel" index="70">
     <chassis name="server" implement="MAY"/>