From 9244e8399db45d25a8ab36efc671ea58458ca490 Mon Sep 17 00:00:00 2001
From: phaller <hallerp@gmail.com>
Date: Fri, 24 Feb 2012 17:48:51 +0100
Subject: [PATCH] Add note about mixing in the Stash trait

---
 akka-actor/src/main/scala/akka/actor/Stash.scala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/akka-actor/src/main/scala/akka/actor/Stash.scala b/akka-actor/src/main/scala/akka/actor/Stash.scala
index 355d150435..160fd26e5e 100644
--- a/akka-actor/src/main/scala/akka/actor/Stash.scala
+++ b/akka-actor/src/main/scala/akka/actor/Stash.scala
@@ -41,6 +41,10 @@ import akka.AkkaException
  *    }
  *  }
  *  </pre>
+ *
+ *  Note that the `Stash` trait must be mixed into (a subclass of) the `Actor` trait before
+ *  any trait/class that overrides the `preRestart` callback. This means it's not possible to write
+ *  `Actor with MyActor with Stash` if `MyActor` overrides `preRestart`.
  */
 trait Stash {
   this: Actor ⇒