ec2launcher 1.6.3 → 1.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 1.6.4
2
+
3
+ * Fixed bug with properly inheriting environment roles in applications.
4
+
1
5
  ## 1.6.3
2
6
 
3
7
  * Fixed typo in block read-ahead settings.
@@ -215,6 +215,17 @@ module EC2Launcher
215
215
  end
216
216
  end
217
217
 
218
+ unless other_server.environment_roles.nil?
219
+ @environment_roles = Hash.new if @environment_roles.nil?
220
+ other_server.environment_roles.keys.each do |env_name|
221
+ if @environment_roles.has_key?(env_name)
222
+ @environment_roles[env_name] = other_server.environment_roles[env_name] + @environment_roles[env_name]
223
+ else
224
+ @environment_roles[env_name] = other_server.environment_roles[env_name]
225
+ end
226
+ end
227
+ end
228
+
218
229
  @use_rvm = other_server.use_rvm if other_server.use_rvm
219
230
  end
220
231
 
@@ -2,5 +2,5 @@
2
2
  # Copyright (c) 2012 Sean Laurent
3
3
  #
4
4
  module EC2Launcher
5
- VERSION = "1.6.3"
5
+ VERSION = "1.6.4"
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ec2launcher
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.3
4
+ version: 1.6.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-04 00:00:00.000000000 Z
12
+ date: 2013-01-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: aws-sdk