Merge commit 'v2.2.0'
Conflicts:
rebar
src/ibrowse.app.src
src/ibrowse_test.erl
diff --git a/src/ibrowse.hrl b/include/ibrowse.hrl
similarity index 100%
rename from src/ibrowse.hrl
rename to include/ibrowse.hrl
diff --git a/rebar b/rebar
index b9c73ff..e8b5884 100755
--- a/rebar
+++ b/rebar
Binary files differ
diff --git a/src/ibrowse.app.src b/src/ibrowse.app.src
index 875620d..3dcbef8 100644
--- a/src/ibrowse.app.src
+++ b/src/ibrowse.app.src
@@ -1,12 +1,6 @@
{application, ibrowse,
[{description, "HTTP client application"},
- {vsn, "2.1.3"},
- {modules, [ ibrowse,
- ibrowse_http_client,
- ibrowse_app,
- ibrowse_sup,
- ibrowse_lib,
- ibrowse_lb ]},
+ {vsn, git},
{registered, []},
{applications, [kernel,stdlib,sasl]},
{env, []},
diff --git a/src/ibrowse_test.erl b/src/ibrowse_test.erl
index ff3b530..502806b 100644
--- a/src/ibrowse_test.erl
+++ b/src/ibrowse_test.erl
@@ -5,7 +5,7 @@
-module(ibrowse_test).
-export([
- load_test/3,
+ test_load/3,
send_reqs_1/3,
do_send_req/2,
unit_tests/0,
@@ -64,7 +64,7 @@
end.
%% Use ibrowse:set_max_sessions/3 and ibrowse:set_max_pipeline_size/3 to
%% tweak settings before running the load test. The defaults are 10 and 10.
-load_test(Url, NumWorkers, NumReqsPerWorker) when is_list(Url),
+test_load(Url, NumWorkers, NumReqsPerWorker) when is_list(Url),
is_integer(NumWorkers),
is_integer(NumReqsPerWorker),
NumWorkers > 0,
diff --git a/test/ibrowse_lib_tests.erl b/test/ibrowse_lib_tests.erl
index ef3cb05..6f613e9 100644
--- a/test/ibrowse_lib_tests.erl
+++ b/test/ibrowse_lib_tests.erl
@@ -6,7 +6,7 @@
-module(ibrowse_lib_tests).
-include_lib("eunit/include/eunit.hrl").
--include("src/ibrowse.hrl").
+-include_lib("ibrowse/include/ibrowse.hrl").
parse_urls_test_() ->
