Merge pull request #15503 from akka/wip-15501-add-bounded-nonblocking-mpmc-mailbox-√

+act - #15501 - Adding support for a Non-blocking, bounded, MPMC mailbox...

akka-docs/rst/java/mailboxes.rst

@@ -131,6 +131,16 @@ Akka comes shipped with a number of mailbox implementations:
 
   - Configuration name: "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
 
+* NonBlockingBoundedMailbox
+
+  - Backed by a very efficient MultiPle-Producer Multiple-Consumer queue
+
+  - Blocking: No
+
+  - Bounded: Yes
+
+  - Configuration name: "akka.dispatch.NonBlockingBoundedMailbox"
+
 * BoundedMailbox
 
   - Backed by a ``java.util.concurrent.LinkedBlockingQueue``

akka-docs/rst/scala/mailboxes.rst

@@ -123,7 +123,7 @@ Akka comes shipped with a number of mailbox implementations:
 
 * SingleConsumerOnlyUnboundedMailbox
 
-  - Backed by a very efficient Multiple Producer Single Consumer queue, cannot be used with BalancingDispatcher
+  - Backed by a very efficient Multiple-Producer Single-Consumer queue, cannot be used with BalancingDispatcher
 
   - Blocking: No
 
@@ -141,6 +141,16 @@ Akka comes shipped with a number of mailbox implementations:
 
   - Configuration name: "bounded" or "akka.dispatch.BoundedMailbox"
 
+* NonBlockingBoundedMailbox
+
+  - Backed by a very efficient MultiPle-Producer Multiple-Consumer queue
+
+  - Blocking: No
+
+  - Bounded: Yes
+
+  - Configuration name: "akka.dispatch.NonBlockingBoundedMailbox"
+
 * UnboundedPriorityMailbox
 
   - Backed by a ``java.util.concurrent.PriorityBlockingQueue``