From 09aa37036295fb24e3e265c38e3785b4e0c100d6 Mon Sep 17 00:00:00 2001
From: Lee Hambley <lee.hambley@gmail.com>
Date: Tue, 15 Apr 2014 13:13:12 +0200
Subject: [PATCH] Revert "Merge pull request #967 from rosenfeld/patch-1"

This reverts commit 1f69d3689a5dd2d83a83b7093d85af9314b454be, reversing
changes made to a0dccd88e651e3d47d8b6f7835fe762371ddff69.
---
 lib/capistrano/dsl/env.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/capistrano/dsl/env.rb b/lib/capistrano/dsl/env.rb
index 0b086056..53c86620 100644
--- a/lib/capistrano/dsl/env.rb
+++ b/lib/capistrano/dsl/env.rb
@@ -45,8 +45,11 @@ module Capistrano
 
       def release_roles(*names)
         options = { exclude: :no_release }
-        options.merge! names.pop if names.last.is_a? Hash
-        names << options
+        if names.last.is_a? Hash
+          names.last.merge(options)
+        else
+          names << options
+        end
         roles(*names)
       end