merge heads

Author: rade

src/rabbit_invariable_queue.erl

@@ -242,8 +242,7 @@ do_if_persistent(F, Txn, QName) ->
 persist_message(QName, true, Txn, Msg = #basic_message {
                                     is_persistent = true }) ->
     Msg1 = Msg #basic_message {
-             %% don't persist any recoverable decoded properties,
-             %% rebuild from properties_bin on restore
+             %% don't persist any recoverable decoded properties
              content = rabbit_binary_parser:clear_decoded_content(
                          Msg #basic_message.content)},
     persist_work(Txn, QName,