kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[aws|cloudwatch] Fix merge error.

Browse source
This commit is contained in:
Jens Braeuer 2011-10-04 15:33:49 +02:00
parent fcf599bf35
commit bbc2a8aa24
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/fog/aws/cloud_watch.rb
View file

@ -13,7 +13,6 @@ module Fog
request :list_metrics request :list_metrics
request :get_metric_statistics request :get_metric_statistics
request :put_metric_data request :put_metric_data
<<<<<<< HEAD
request :describe_alarms request :describe_alarms
request :put_metric_alarm request :put_metric_alarm
request :delete_alarms request :delete_alarms
@ -22,9 +21,6 @@ module Fog
request :disable_alarm_actions request :disable_alarm_actions
request :describe_alarms_for_metric request :describe_alarms_for_metric
request :set_alarm_state request :set_alarm_state
=======
request :put_metric_alarm
>>>>>>> [aws|cloudwatch] Add support for put-metric-alarm call.
model_path 'fog/aws/models/cloud_watch' model_path 'fog/aws/models/cloud_watch'
model :metric model :metric