Merge branch 'release/1.2.18'

leo-project · Jan 7, 2016 · 52cbe88 · 52cbe88
2 parents 554a05d + b7796ce
commit 52cbe88
Show file tree

Hide file tree

Showing 25 changed files with 640 additions and 481 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,2 @@
+Yosuke Hara
+Yoshiyuki Kanno
diff --git a/include/leo_manager.hrl b/include/leo_manager.hrl
diff --git a/include/tcp_server.hrl b/include/tcp_server.hrl
@@ -20,15 +20,15 @@
 %%
 %%======================================================================
 -record(tcp_server_params, {
-          prefix_of_name = "tcp_server_"  :: string(),
+          prefix_of_name = "tcp_server_" :: string(),
           listen = [binary, {packet, line}, {active, false}, {reuseaddr, true}],
-          port                    = 10010 :: integer(),
-          num_of_listeners        = 3     :: integer(),
-          restart_times           = 3     :: integer(),
-          time                    = 60    :: integer(),
-          shutdown                = 2000  :: integer(),
-          accept_timeout          = infinity,
-          accept_error_sleep_time = 3000  :: integer(),
-          recv_length             = 0     :: integer(),
-          recv_timeout            = infinity
+          port = 10010 :: pos_integer(),
+          num_of_listeners = 3 :: pos_integer(),
+          restart_times = 3 :: pos_integer(),
+          time = 60 :: pos_integer(),
+          shutdown = 2000  :: pos_integer(),
+          accept_timeout = infinity,
+          accept_error_sleep_time = 3000 :: pos_integer(),
+          recv_length = 0 :: non_neg_integer(),
+          recv_timeout = infinity
          }).
diff --git a/priv/leo_manager_0.schema b/priv/leo_manager_0.schema
@@ -97,7 +97,7 @@
  "leo_manager.system_version",
  [
   {datatype, string},
-  {default, "1.2.16"}
+  {default, "1.2.18"}
  ]}.
 
 %% @doc Mode of Manager: [master|slave]

diff --git a/priv/leo_manager_1.schema b/priv/leo_manager_1.schema
@@ -97,7 +97,7 @@
  "leo_manager.system_version",
  [
   {datatype, string},
-  {default, "1.2.16"}
+  {default, "1.2.18"}
  ]}.
 
 %% @doc Mode of Manager: [master, slave]

diff --git a/rebar.config b/rebar.config
@@ -23,14 +23,14 @@
 {require_otp_vsn, "R16B*|17"}.
 
 {deps, [
-        {leo_commons,           ".*", {git, "https://github.com/leo-project/leo_commons.git",           {tag, "1.1.5"}}},
-        {leo_logger,            ".*", {git, "https://github.com/leo-project/leo_logger.git",            {tag, "1.1.11"}}},
-        {leo_object_storage,    ".*", {git, "https://github.com/leo-project/leo_object_storage.git",    {tag, "1.2.10"}}},
-        {leo_redundant_manager, ".*", {git, "https://github.com/leo-project/leo_redundant_manager.git", {tag, "1.9.19"}}},
-        {leo_rpc,               ".*", {git, "https://github.com/leo-project/leo_rpc.git",               {tag, "0.10.6"}}},
-        {leo_statistics,        ".*", {git, "https://github.com/leo-project/leo_statistics.git",        {tag, "1.1.9"}}},
-        {leo_s3_libs,           ".*", {git, "https://github.com/leo-project/leo_s3_libs.git",           {tag, "1.1.9"}}},
-        {jiffy,                 ".*", {git, "https://github.com/davisp/jiffy.git",                      {tag, "0.13.3"}}},
+        {leo_commons,           ".*", {git, "https://github.com/leo-project/leo_commons.git",           {tag, "1.1.6"}}},
+        {leo_logger,            ".*", {git, "https://github.com/leo-project/leo_logger.git",            {tag, "1.2.2"}}},
+        {leo_object_storage,    ".*", {git, "https://github.com/leo-project/leo_object_storage.git",    {tag, "1.2.12"}}},
+        {leo_redundant_manager, ".*", {git, "https://github.com/leo-project/leo_redundant_manager.git", {tag, "1.9.22"}}},
+        {leo_rpc,               ".*", {git, "https://github.com/leo-project/leo_rpc.git",               {tag, "0.10.7"}}},
+        {leo_statistics,        ".*", {git, "https://github.com/leo-project/leo_statistics.git",        {tag, "1.1.10"}}},
+        {leo_s3_libs,           ".*", {git, "https://github.com/leo-project/leo_s3_libs.git",           {tag, "1.1.10"}}},
+        {jiffy,                 ".*", {git, "https://github.com/davisp/jiffy.git",                      {tag, "0.14.4"}}},
         {meck,                  ".*", {git, "https://github.com/eproxus/meck.git",                      {tag, "0.8.2"}}}
        ]}.
 

diff --git a/src/leo_manager.app.src b/src/leo_manager.app.src
@@ -23,7 +23,7 @@
 {application, leo_manager,
  [
   {description, "LeoFS Manager"},
-  {vsn, "1.2.16"},
+  {vsn, "1.2.18"},
   {id,  "leo_manager"},
   {registered,   []},
   {applications, [kernel, stdlib, crypto]},