Merge branch 'release/1.1.9'

leo-project · Jan 18, 2017 · 311b65c · 311b65c
2 parents 7c57b65 + de45096
commit 311b65c
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 37 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,3 @@
+Yosuke Hara
+Yoshiyuki Kanno
+Wilson Li
diff --git a/include/leo_commons.hrl b/include/leo_commons.hrl
@@ -2,7 +2,7 @@
 %%
 %% LeoFS Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -22,7 +22,6 @@
 %% Leo Commons -  Constant/Macro/Record
 %%
 %%======================================================================
--author('Yosuke Hara').
 
 -record(cluster_node_status, {
           type                :: gateway | storage,

diff --git a/src/leo_commons.app.src b/src/leo_commons.app.src
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2016 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -22,7 +22,7 @@
 {application, leo_commons,
   [
    {description, "Leo Commons"},
-   {vsn, "1.1.8"},
+   {vsn, "1.1.9"},
    {id, "leo_commons"},
    {registered, []},
    {applications, [kernel, stdlib]},

diff --git a/src/leo_commons.erl b/src/leo_commons.erl
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/src/leo_date.erl b/src/leo_date.erl
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -27,8 +27,6 @@
 %%======================================================================
 -module(leo_date).
 
--author('Yosuke Hara').
-
 -export([now/0, clock/0, zone/0,
          date_format/0, date_format/1, date_format/2,
          unixtime/0, unixtime_to_greg_seconds/1,

diff --git a/src/leo_file.erl b/src/leo_file.erl
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -27,9 +27,6 @@
 %%======================================================================
 -module(leo_file).
 
--author('Yosuke Hara').
--author('Yoshiyuki Kanno').
-
 -include("leo_commons.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("kernel/include/file.hrl").

diff --git a/src/leo_hex.erl b/src/leo_hex.erl
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -27,9 +27,6 @@
 %%======================================================================
 -module(leo_hex).
 
--author('Yosuke Hara').
--author('Yoshiyuki Kanno').
-
 -include_lib("eunit/include/eunit.hrl").
 
 -export([binary_to_hex/1,

diff --git a/src/leo_http.erl b/src/leo_http.erl
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

diff --git a/src/leo_math.erl b/src/leo_math.erl
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -27,7 +27,6 @@
 %%======================================================================
 -module(leo_math).
 
--author('Yosuke Hara').
 -export([power/2, floor/1, ceiling/1]).
 
 %%--------------------------------------------------------------------

diff --git a/src/leo_mime.erl b/src/leo_mime.erl
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -26,9 +26,6 @@
 %%======================================================================
 -module(leo_mime).
 
--author('Yosuke Hara').
--author('Yoshiyuki Kanno').
-
 -include_lib("eunit/include/eunit.hrl").
 
 -export([guess_mime/1]).

diff --git a/src/leo_misc.erl b/src/leo_misc.erl
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -27,8 +27,6 @@
 %%======================================================================
 -module(leo_misc).
 
--author('Yosuke Hara').
-
 -export([node_existence/1, node_existence/2,
          get_value/2, get_value/3,
          binary_tokens/2,

diff --git a/src/leo_mnesia.erl b/src/leo_mnesia.erl
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -27,8 +27,6 @@
 %%======================================================================
 -module(leo_mnesia).
 
--author('Yosuke Hara').
-
 -include("leo_commons.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("stdlib/include/qlc.hrl").
@@ -42,7 +40,7 @@
              {ok, [any()]} | not_found | {error, any()}
                  when Fun::function()).
 read(Fun) ->
-    case catch mnesia:activity(transaction, Fun) of
+    case catch mnesia:activity(sync_transaction, Fun) of
         {_, Cause} ->
             {error, Cause};
         [] ->
@@ -57,7 +55,7 @@ read(Fun) ->
              ok | {error, any()}
                  when Fun::function()).
 write(Fun) ->
-    case catch mnesia:activity(transaction, Fun) of
+    case catch mnesia:activity(sync_transaction, Fun) of
         ok ->
             ok;
         {_, Cause} ->
@@ -70,7 +68,7 @@ write(Fun) ->
              ok | {error, any()}
                  when Fun::function()).
 delete(Fun) ->
-    case catch mnesia:activity(transaction, Fun) of
+    case catch mnesia:activity(sync_transaction, Fun) of
         ok ->
             ok;
         {_, Cause} ->
@@ -83,7 +81,7 @@ delete(Fun) ->
              ok | {error, any()}
                  when Fun::function()).
 batch(Fun) ->
-    case catch mnesia:activity(transaction, Fun) of
+    case catch mnesia:activity(sync_transaction, Fun) of
         ok ->
             ok;
         {_, Cause} ->
@@ -112,7 +110,7 @@ export(FilePath, Table, ExportType) ->
     Rows = mnesia:table_info(Table, size),
 
     %% output records
-    mnesia:transaction(
+    mnesia:sync_transaction(
       fun() ->
               case catch  mnesia:first(Table) of
                   '$end_of_table' ->

diff --git a/src/leo_net.erl b/src/leo_net.erl
@@ -2,7 +2,7 @@
 %%
 %% Leo Commons
 %%
-%% Copyright (c) 2012-2015 Rakuten, Inc.
+%% Copyright (c) 2012-2017 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -27,8 +27,6 @@
 %%======================================================================
 -module(leo_net).
 
--author('Wilson Li').
-
 -include_lib("eunit/include/eunit.hrl").
 
 -export([chunked_send/3, chunked_send/4]).