Skip to content

Commit

Permalink
Merge branch 'release/1.2.14'
Browse files Browse the repository at this point in the history
  • Loading branch information
@yosukehara
yosukehara committed Sep 11, 2015
2 parents fe10d3f + 28d5d81 commit 4255340
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 4 deletions.
45 changes: 45 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,51 @@
CHANGELOG
=========

1.2.14 (September 11, 2015)
===========================

* Fixed Bugs
* [#416](https://github.com/leo-project/leofs/issues/416) ``leo_manager`` ``leo_redundant_manager`` Cannot execute the rebalance command with manual operaiton
* It was happened while one manager-node downed
* [#417](https://github.com/leo-project/leofs/issues/417) ``leo_manager`` ``leo_redundant_manager`` It possible of inconsistent status of a storage-node between leo_redundant_manager and leo_manager
* [#418](https://github.com/leo-project/leofs/issues/418) ``leo_manager`` leo_manager slave can't restart when detach was executed while the slave was down

* Used libraries
* leo project
* [leo_backend-db v1.1.9](https://github.com/leo-project/leo_backend_db/releases/tag/1.1.9)
* [leo_cache v0.6.5](https://github.com/leo-project/leo_cache/releases/tag/0.6.5)
* [leo_commons v1.1.4](https://github.com/leo-project/leo_commons/releases/tag/1.1.4)
* [leo_dcerl v0.4.0](https://github.com/leo-project/leo_dcerl/releases/tag/0.4.0)
* [leo_logger v1.1.6](https://github.com/leo-project/leo_logger/releases/tag/1.1.6)
* [leo_mcerl v0.6.0](https://github.com/leo-project/leo_mcerl/releases/tag/0.6.0)
* [leo_mq v1.3.14](https://github.com/leo-project/leo_mq/releases/tag/1.3.14)
* [leo_object_storage v1.2.9](https://github.com/leo-project/leo_object_storage/releases/tag/1.2.9)
* [leo_ordning_reda v1.1.0](https://github.com/leo-project/leo_ordning_reda/releases/tag/1.1.0)
* [leo_redundant_manager 1.9.18](https://github.com/leo-project/leo_redundant_manager/releases/tag/1.9.18)
* [leo_rpc v0.10.5](https://github.com/leo-project/leo_rpc/releases/tag/0.10.5)
* [leo_pod v0.6.6](https://github.com/leo-project/leo_pod/releases/tag/0.6.6)
* [leo_s3_libs v1.1.8](https://github.com/leo-project/leo_s3_libs/releases/tag/1.1.8)
* [leo_statistics v1.1.6](https://github.com/leo-project/leo_statistics/releases/tag/1.1.6)
* [leo_watchdog v0.10.2](https://github.com/leo-project/leo_watchdog/releases/tag/0.10.2)
* [savanna_agent v0.4.9](https://github.com/leo-project/savanna_agent/releases/tag/0.4.9)
* [savanna_commons v0.8.12](https://github.com/leo-project/savanna_commons/releases/tag/0.8.12)
* [erpcgen v0.2.3](https://github.com/leo-project/erpcgen/releases/tag/0.2.3)
* [nfs_rpc_server v0.2.3](https://github.com/leo-project/nfs_rpc_server/releases/tag/0.2.3)
* [leo_gateway v1.2.14](https://github.com/leo-project/leo_gateway/releases/tag/1.2.14)
* [leo_manager v1.2.14](https://github.com/leo-project/leo_manager/releases/tag/1.2.14)
* [leo_storage v1.2.14](https://github.com/leo-project/leo_storage/releases/tag/1.2.14)
* others
* [bitcask v2.0.0](https://github.com/lbasho/bitcask/releases/tag/2.0.0)
* [cowboy v1.0.1](https://github.com/leo-project/cowboy/releases/tag/for-leofs-1.2.11)
* [cowlib v1.0.0](https://github.com/extend/cowboy/releases/tag/1.0.0)
* [elarm v0.3.0](https://github.com/leo-project/elarm/releases/tag/0.3.0)
* [eleveldb v2.1.1](https://github.com/basho/eleveldb/releases/tag/2.1.1)
* [folsom v0.8.2-for-leofs](https://github.com/leo-project/folsom/releases/tag/0.8.2-for-leofs)
* [jiffy v0.13.3](https://github.com/davisp/jiffy/releases/tag/0.13.3)
* [lz4 v0.2.2](https://github.com/leo-project/erlang-lz4/releases/tag/0.2.2)
* [recon v0.8.5](https://github.com/ferd/recon/releases/tag/2.2.1)


1.2.12 (July 10, 2015)
======================

Expand Down
5 changes: 5 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
all: deps compile

compile:
make patch
@./rebar compile
deps:
@./rebar get-deps
make patch
clean:
@./rebar clean
make -C pkg clean
Expand All @@ -15,6 +17,9 @@ xref:
eunit:
@./rebar eunit

patch:
(cd deps/leo_commons/ && git checkout refs/tags/1.1.4)

generate:
rm -rf rel/leo_manager/leo_manager/
rm -rf rel/leo_storage/leo_storage/
Expand Down
2 changes: 1 addition & 1 deletion leofs.mk
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LEOFS_VERSION=1.2.12
LEOFS_VERSION=1.2.14
6 changes: 3 additions & 3 deletions rebar.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
{require_otp_vsn, "R16B*|17"}.

{deps, [
{leo_manager, ".*", {git, "https://github.com/leo-project/leo_manager.git", {tag, "1.2.12"}}},
{leo_storage, ".*", {git, "https://github.com/leo-project/leo_storage.git", {tag, "1.2.12"}}},
{leo_gateway, ".*", {git, "https://github.com/leo-project/leo_gateway.git", {tag, "1.2.12"}}},
{leo_manager, ".*", {git, "https://github.com/leo-project/leo_manager.git", {tag, "1.2.14"}}},
{leo_storage, ".*", {git, "https://github.com/leo-project/leo_storage.git", {tag, "1.2.14"}}},
{leo_gateway, ".*", {git, "https://github.com/leo-project/leo_gateway.git", {tag, "1.2.14"}}},
{fifo_utils, "0.1.*", {git, "https://github.com/project-fifo/fifo_utils.git", {tag, "0.1.8"}}}
]}.

Expand Down
50 changes: 50 additions & 0 deletions releasenotes/leofs-1.2.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,53 @@
1.2.14
======

Bugs Fixed
-----------

* [#416](https://github.com/leo-project/leofs/issues/416) ``leo_manager`` ``leo_redundant_manager`` Cannot execute the rebalance command with manual operaiton
* It was happened while one manager-node downed
* [#417](https://github.com/leo-project/leofs/issues/417) ``leo_manager`` ``leo_redundant_manager`` It possible of inconsistent status of a storage-node between leo_redundant_manager and leo_manager
* [#418](https://github.com/leo-project/leofs/issues/418) ``leo_manager`` leo_manager slave can't restart when detach was executed while the slave was down


Used Libraries
---------------

* leo project
* [leo_backend-db v1.1.9](https://github.com/leo-project/leo_backend_db/releases/tag/1.1.9)
* [leo_cache v0.6.5](https://github.com/leo-project/leo_cache/releases/tag/0.6.5)
* [leo_commons v1.1.4](https://github.com/leo-project/leo_commons/releases/tag/1.1.4)
* [leo_dcerl v0.4.0](https://github.com/leo-project/leo_dcerl/releases/tag/0.4.0)
* [leo_logger v1.1.6](https://github.com/leo-project/leo_logger/releases/tag/1.1.6)
* [leo_mcerl v0.6.0](https://github.com/leo-project/leo_mcerl/releases/tag/0.6.0)
* [leo_mq v1.3.14](https://github.com/leo-project/leo_mq/releases/tag/1.3.14)
* [leo_object_storage v1.2.9](https://github.com/leo-project/leo_object_storage/releases/tag/1.2.9)
* [leo_ordning_reda v1.1.0](https://github.com/leo-project/leo_ordning_reda/releases/tag/1.1.0)
* [leo_redundant_manager 1.9.18](https://github.com/leo-project/leo_redundant_manager/releases/tag/1.9.18)
* [leo_rpc v0.10.5](https://github.com/leo-project/leo_rpc/releases/tag/0.10.5)
* [leo_pod v0.6.6](https://github.com/leo-project/leo_pod/releases/tag/0.6.6)
* [leo_s3_libs v1.1.8](https://github.com/leo-project/leo_s3_libs/releases/tag/1.1.8)
* [leo_statistics v1.1.6](https://github.com/leo-project/leo_statistics/releases/tag/1.1.6)
* [leo_watchdog v0.10.2](https://github.com/leo-project/leo_watchdog/releases/tag/0.10.2)
* [savanna_agent v0.4.9](https://github.com/leo-project/savanna_agent/releases/tag/0.4.9)
* [savanna_commons v0.8.12](https://github.com/leo-project/savanna_commons/releases/tag/0.8.12)
* [erpcgen v0.2.3](https://github.com/leo-project/erpcgen/releases/tag/0.2.3)
* [nfs_rpc_server v0.2.3](https://github.com/leo-project/nfs_rpc_server/releases/tag/0.2.3)
* [leo_gateway v1.2.14](https://github.com/leo-project/leo_gateway/releases/tag/1.2.14)
* [leo_manager v1.2.14](https://github.com/leo-project/leo_manager/releases/tag/1.2.14)
* [leo_storage v1.2.14](https://github.com/leo-project/leo_storage/releases/tag/1.2.14)
* others
* [bitcask v2.0.0](https://github.com/lbasho/bitcask/releases/tag/2.0.0)
* [cowboy v1.0.1](https://github.com/leo-project/cowboy/releases/tag/for-leofs-1.2.11)
* [cowlib v1.0.0](https://github.com/extend/cowboy/releases/tag/1.0.0)
* [elarm v0.3.0](https://github.com/leo-project/elarm/releases/tag/0.3.0)
* [eleveldb v2.1.1](https://github.com/basho/eleveldb/releases/tag/2.1.1)
* [folsom v0.8.2-for-leofs](https://github.com/leo-project/folsom/releases/tag/0.8.2-for-leofs)
* [jiffy v0.13.3](https://github.com/davisp/jiffy/releases/tag/0.13.3)
* [lz4 v0.2.2](https://github.com/leo-project/erlang-lz4/releases/tag/0.2.2)
* [recon v0.8.5](https://github.com/ferd/recon/releases/tag/2.2.1)


1.2.12
======

Expand Down

0 comments on commit 4255340

Please sign in to comment.