Skip to content
Browse files

Merge branch '1.4'

Conflicts:
	rebar.config
  • Loading branch information...
2 parents ad557ea + 8204a03 commit 88b552da30a153113408735a2b824d1656e5e782 @jaredmorrow jaredmorrow committed Oct 14, 2013
Showing with 73 additions and 2 deletions.
  1. +35 −0 RELEASE-NOTES.ja.md
  2. +36 −0 RELEASE-NOTES.md
  3. +1 −1 rebar.config
  4. +1 −1 rel/reltool.config
View
35 RELEASE-NOTES.ja.md
@@ -1,3 +1,38 @@
+# Riak 1.4.2 リリースノート
+
+これはRiak 1.4.x系のバグフィックスのリリースです。
+
+* stats 関連の問題を解決
+* 1.4.1 からの不要なログを削除(Not foundのエラーなど)
+* 2iクエリのタイムアウト関連の問題を解決
+* バックエンドの壊れたデータに対する追加の安全策を導入
+* Riak Controlでの、ノードが非互換に見える不正なネゴシエーションを修正
+
+## 解決された問題
+
+* leveldb/89: [スループット制御の小さな調整](https://github.com/basho/leveldb/wiki/mv-level-work4)
+* node_package/77: [FreeBSD で lib と etc ディレクトリにファイルを追加](https://github.com/basho/node_package/issues/77)
+* node_package/82: [Debのpostinstスクリプトが/etcディレクトリをchmodしようとする](https://github.com/basho/node_package/issues/82)
+* node_package/83: [FreeBSD パッケージが .tbz ではなく .tgz としてパッケージされてしまう](https://github.com/basho/node_package/issues/83)
+* riak_control/132: [1.4でネゴシエーション順序が不正](https://github.com/basho/riak_control/pull/132)
+* riak_control/133: [拡張レコードマクロを使用](https://github.com/basho/riak_control/pull/133)
+* riak_control/135: [非互換は比較的深刻ではない](https://github.com/basho/riak_control/pull/135)
+* riak_kv/644: [webmachine の 2i タイムアウトを修正](https://github.com/basho/riak_kv/pull/644)
+* riak_kv/639: [HTTP MapReduce のエラーレポート表示を修正](https://github.com/basho/riak_kv/commit/01190f23099bf7febbb69d74f6b4922a91d045e3)
+* riak_kv/636: [riak_kv_stat クラッシュによるプロセスリークを修正](https://github.com/basho/riak_kv/pull/636)
+* riak_kv/638: [デシリアライズとCRCエラーをnot_foundとみなす](https://github.com/basho/riak_kv/pull/638)
+* riak_kv/641: [1.4のLevelDBのfoldを改善](https://github.com/basho/riak_kv/pull/641)
+* riak_kv/635: [2i タイムアウトのレスポンスを改善](https://github.com/basho/riak_kv/pull/635)
+* riak_kv/632: [riak_kv_stat のタイムアウトを修正](https://github.com/basho/riak_kv/pull/632)
+* riak_core/356: [folsom の stat エラーのハンドリングを追加](https://github.com/basho/riak_core/pull/356)
+* riak_core/359: [handoff中のデータ破壊を検出](https://github.com/basho/riak_core/pull/359)
+* webmachine/137: [Webmachine の単体テスト、結合テストのカバレッジ改善](https://github.com/basho/webmachine/pull/137)
+* webmachine/164: [Webmachineの組み込みのログハンドラをエラーログで使用](https://github.com/basho/webmachine/pull/164)
+* webmachine/161: [Webmachine APIでソケットを取得できるように変更](https://github.com/basho/webmachine/pull/161)
+* webmachine/160: [R15B01以降のErlangとの互換性を再追加](https://github.com/basho/webmachine/pull/160)
+* webmachine/158: [localtime から universaltime への変換を回避](https://github.com/basho/webmachine/pull/158)
+* webmachine/156: [Erlang R15 互換性を追加](https://github.com/basho/webmachine/pull/156)
+
# Riak 1.4.1 リリースノート
これはバグフィックスのリリースです。主にセカンダリーインデックス、Riak Control、LevelDB に関する修正が含まれています。
View
36 RELEASE-NOTES.md
@@ -1,3 +1,39 @@
+# Riak 1.4.2 Release Notes
+
+This is a bugfix release on the Riak 1.4.x series.
+
+* Fixed various problems related to crashing stats
+* Fixed extra noisy logs introduced in 1.4.1 (Not found errors and others)
+* Fixed issues related to 2i queries timing out
+* Added more protection against corrupt data in backends
+* Fixed incorrect capability negotiation causing nodes to appear incompatible in Riak Control
+
+## Issues / PR's Resolved
+
+* leveldb/89: [Minor adjustments to throttle](https://github.com/basho/leveldb/wiki/mv-level-work4)
+* node_package/77: [FreeBSD needs to scan lib and etc directories for extra files](https://github.com/basho/node_package/issues/77)
+* node_package/82: [Deb: Deb postinst script attempts to chmod's /etc directory](https://github.com/basho/node_package/issues/82)
+* node_package/83: [FreeBSD package incorrectly packaged as .tgz rather than .tbz](https://github.com/basho/node_package/issues/83)
+* riak_control/132: [Resolve incorrect capability negotation order in 1.4](https://github.com/basho/riak_control/pull/132)
+* riak_control/133: [Use expanded record macro.](https://github.com/basho/riak_control/pull/133)
+* riak_control/135: [Incompatible is less serious](https://github.com/basho/riak_control/pull/135)
+* riak_kv/644: [Fix webmachine 2i timeout](https://github.com/basho/riak_kv/pull/644)
+* riak_kv/639: [Fix HTTP MR error reporting](https://github.com/basho/riak_kv/commit/01190f23099bf7febbb69d74f6b4922a91d045e3)
+* riak_kv/636: [Fix riak_kv_stat crash leaking processes](https://github.com/basho/riak_kv/pull/636)
+* riak_kv/638: [Bad deserialization and CRC errors to not_found](https://github.com/basho/riak_kv/pull/638)
+* riak_kv/641: [LevelDB fold hardening for 1.4](https://github.com/basho/riak_kv/pull/641)
+* riak_kv/635: [Fix 2i timeout responses](https://github.com/basho/riak_kv/pull/635)
+* riak_kv/632: [Fix riak_kv_stat timeout](https://github.com/basho/riak_kv/pull/632)
+* riak_core/356: [Add protection against folsom stat errors](https://github.com/basho/riak_core/pull/356)
+* riak_core/359: [Support for corruption detecting during handoff](https://github.com/basho/riak_core/pull/359)
+* webmachine/137: [Increase line coverage of Webmachine unit and integration tests](https://github.com/basho/webmachine/pull/137)
+* webmachine/164: [Rework Webmachine error logging to use the built-in log handler](https://github.com/basho/webmachine/pull/164)
+* webmachine/161: [Expose local socket via the Webmachine API](https://github.com/basho/webmachine/pull/161)
+* webmachine/160: [Re-add compatibility for Erlang versions newer than R15B01](https://github.com/basho/webmachine/pull/160)
+* webmachine/158: [Avoid localtime to universaltime](https://github.com/basho/webmachine/pull/158)
+* webmachine/156: [Fix Erlang R15 compatibility](https://github.com/basho/webmachine/pull/156)
+
+
# Riak 1.4.1 Release Notes
This is a bugfix release. The major fixes are to the Secondary Index,
View
2 rebar.config
@@ -13,7 +13,7 @@
]}.
{deps, [
- {node_package, ".*", {git, "git://github.com/basho/node_package", {tag, "1.3.4"}}},
+ {node_package, ".*", {git, "git://github.com/basho/node_package", {tag, "1.3.8"}}},
{lager_syslog, "2.0.0", {git, "git://github.com/basho/lager_syslog", {tag, "2.0.0"}}},
{cluster_info, ".*", {git, "git://github.com/basho/cluster_info", {branch, "master"}}},
{riak_kv, ".*", {git, "git://github.com/basho/riak_kv", {branch, "master"}}},
View
2 rel/reltool.config
@@ -2,7 +2,7 @@
%% ex: ft=erlang ts=4 sw=4 et
{sys, [
{lib_dirs, ["../deps", "../deps/riak_search/apps"]},
- {rel, "riak", "1.4.1",
+ {rel, "riak", "1.4.2",
[
kernel,
stdlib,

0 comments on commit 88b552d

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