Skip to content
Browse files

Merge remote-tracking branch 'refs/remotes/tsloughter/master'

  • Loading branch information...
2 parents 5ca1e54 + ba91f46 commit 362468a3798ec14970e7172f31fecad41e986a38 @gleber gleber committed Mar 21, 2012
Showing with 32 additions and 32 deletions.
  1. +0 −6 sinan.cfg
  2. +6 −0 sinan.config
  3. +1 −1 src/erlcloud_aws.erl
  4. +3 −3 src/erlcloud_ec2.erl
  5. +2 −2 src/erlcloud_elb.erl
  6. +11 −11 src/erlcloud_mon.erl
  7. +3 −3 src/erlcloud_mturk.erl
  8. +2 −2 src/erlcloud_s3.erl
  9. +2 −2 src/erlcloud_sdb.erl
  10. +2 −2 src/erlcloud_sqs.erl
View
6 sinan.cfg
@@ -1,6 +0,0 @@
-project : {
- name : erlcloud
- vsn : "0.4.0"
-},
-
-repositories : []
View
6 sinan.config
@@ -0,0 +1,6 @@
+{project_name, erlcloud}.
+{project_vsn, "0.4.0"}.
+
+{build_dir, "_build"}.
+
+{dep_dirs, []}.
View
2 src/erlcloud_aws.erl
@@ -2,7 +2,7 @@
-export([aws_request/6, aws_request_xml/6,
param_list/2, default_config/0, format_timestamp/1]).
--include("erlcloud_aws.hrl").
+-include_lib("erlcloud/include/erlcloud_aws.hrl").
aws_request_xml(Method, Host, Path, Params, AccessKeyID, SecretAccessKey) ->
Body = aws_request(Method, Host, Path, Params, AccessKeyID, SecretAccessKey),
View
6 src/erlcloud_ec2.erl
@@ -112,9 +112,9 @@
-import(erlcloud_xml, [get_text/1, get_text/2, get_text/3, get_bool/2, get_list/2, get_integer/2]).
-define(API_VERSION, "2009-11-30").
--include("erlcloud.hrl").
--include("erlcloud_aws.hrl").
--include("erlcloud_ec2.hrl").
+-include_lib("erlcloud/include/erlcloud.hrl").
+-include_lib("erlcloud/include/erlcloud_aws.hrl").
+-include_lib("erlcloud/include/erlcloud_ec2.hrl").
-spec(new/2 :: (string(), string()) -> aws_config()).
new(AccessKeyID, SecretAccessKey) ->
View
4 src/erlcloud_elb.erl
@@ -15,8 +15,8 @@
configure_health_check/2, configure_health_check/3]).
--include("erlcloud.hrl").
--include("erlcloud_aws.hrl").
+-include_lib("erlcloud/include/erlcloud.hrl").
+-include_lib("erlcloud/include/erlcloud_aws.hrl").
-define(API_VERSION, "2009-05-15").
View
22 src/erlcloud_mon.erl
@@ -20,9 +20,9 @@
test2/0
]).
--include("erlcloud.hrl").
--include("erlcloud_aws.hrl").
--include("erlcloud_mon.hrl").
+-include_lib("erlcloud/include/erlcloud.hrl").
+-include_lib("erlcloud/include/erlcloud_aws.hrl").
+-include_lib("erlcloud/include/erlcloud_mon.hrl").
-include_lib("xmerl/include/xmerl.hrl").
-import(erlcloud_xml, [get_text/1, get_text/2, get_text/3, get_bool/2, get_list/2, get_integer/2]).
@@ -229,14 +229,14 @@ put_metric_data(Namespace, MetricName, Value, Unit, Timestamp) ->
) -> term().
get_metric_statistics(
- Namespace,
- MetricName,
- StartTime,
- EndTime,
- Period,
- Unit,
- Statistics,
- Dimensions
+ _Namespace,
+ _MetricName,
+ _StartTime,
+ _EndTime,
+ _Period,
+ _Unit,
+ _Statistics,
+ _Dimensions
) ->
todo.
View
6 src/erlcloud_mturk.erl
@@ -57,9 +57,9 @@
update_qualification_type/1, update_qualification_type/2
]).
--include("erlcloud.hrl").
--include("erlcloud_aws.hrl").
--include("erlcloud_mturk.hrl").
+-include_lib("erlcloud/include/erlcloud.hrl").
+-include_lib("erlcloud/include/erlcloud_aws.hrl").
+-include_lib("erlcloud/include/erlcloud_mturk.hrl").
-include_lib("xmerl/include/xmerl.hrl").
-define(API_VERSION, "2008-08-02").
View
4 src/erlcloud_s3.erl
@@ -19,8 +19,8 @@
put_object/3, put_object/4, put_object/5, put_object/6,
set_object_acl/3, set_object_acl/4]).
--include("erlcloud.hrl").
--include("erlcloud_aws.hrl").
+-include_lib("erlcloud/include/erlcloud.hrl").
+-include_lib("erlcloud/include/erlcloud_aws.hrl").
-include_lib("xmerl/include/xmerl.hrl").
-spec new(string(), string()) -> aws_config().
View
4 src/erlcloud_sdb.erl
@@ -27,8 +27,8 @@
select/1, select/2, select/3, select/4
]).
--include("erlcloud.hrl").
--include("erlcloud_aws.hrl").
+-include_lib("erlcloud/include/erlcloud.hrl").
+-include_lib("erlcloud/include/erlcloud_aws.hrl").
-define(API_VERSION, "2009-04-15").
View
4 src/erlcloud_sqs.erl
@@ -17,8 +17,8 @@
set_queue_attributes/2, set_queue_attributes/3
]).
--include("erlcloud.hrl").
--include("erlcloud_aws.hrl").
+-include_lib("erlcloud/include/erlcloud.hrl").
+-include_lib("erlcloud/include/erlcloud_aws.hrl").
-define(API_VERSION, "2009-02-01").

0 comments on commit 362468a

Please sign in to comment.
Something went wrong with that request. Please try again.