Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ku/merge 2.0 #1275

Merged
merged 371 commits into from
Dec 9, 2015
Merged

Ku/merge 2.0 #1275

merged 371 commits into from
Dec 9, 2015

Conversation

kuenishi
Copy link
Contributor

@kuenishi kuenishi commented Dec 7, 2015

To include #1255 and #1272 in 2.1.

shino and others added 30 commits July 10, 2015 17:45
Add latency stats items to S3 API and velvet calls  [JIRA: RCS-220]

Reviewed-by: kuenishi
…issing

Add default riak_cs_wm_common's multiple_choices callback  [JIRA: RCS-221]

Reviewed-by: kuenishi
Stack error reasons on block retrieving failure [JIRA: RCS-223]

Reviewed-by: shino
…fline-gc-tool

Filter out meta dir in offline gc tool  [JIRA: RCS-238]

Reviewed-by: kuenishi
2i for listing MP uploads should use equal query but the function
riakc_pb_socket:get_range/5 was used which is for range query.  But,
so luckily, this bug did not manifests for user facing response.

The reason was two-fold,
1. only 2i key is important and value is always <<"1">> for MP 2i, and
2. Timeout value 60000 (integer) is larger than <<"1">> after
   converted to binary.

So this commit fixes a bug that has not became reality ever.
Add latency stats for riak pb client operations

Reviewed-by: kuenishi
Add status around PB pools, memory, system and mochiweb [RCS-244]

Reviewed-by: kuenishi
The bug was introduced at commit a07eb28.
This commit is a partial revert ot it.

True fix
Fix two lines of wrong rtcs:pass() usage in access_stats_test

Reviewed-by: kuenishi
Velvet have been including many duplicate code. There are still
many duplicates, but so far this will be kept as it is.
Lauren and others added 19 commits October 7, 2015 17:58
Updated the date to reflect the new release date. Also updated some of the notes per Kota's feedback. :)
Because it will results in notfound error, almost, in vein.
Remove a section not fully implemented in this release and update link to documentation.
Update release notes for 2.1.0

Reviewed-by: kuenishi
Bugfix/still rt is failing oh my bad

Reviewed-by: kuenishi
Rebased "fall back on /etc/riak-cs/app.config when no generated one is found"

Reviewed-by: shino
Add release notes for last-minute fixes

Reviewed-by: kuenishi
Japanese translation of Releasenote 2.1.0
@kuenishi kuenishi added this to the 2.1.1 milestone Dec 7, 2015
Resp?LORESP.is_truncated] ++
[make_external_node('MaxKeys', Resp?LORESP.max_keys),
make_external_node('Delimiter', Resp?LORESP.delimiter),
make_external_node('IsTruncated', Resp?LORESP.is_truncated)] ++
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for stepping in... this line may be necessary, it was added for bug fix at 45387fd?w=1

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, commented on wrong line...

@kuenishi
Copy link
Contributor Author

kuenishi commented Dec 9, 2015

It might be strange that I do +1 to my pull request, but according to my test on inspector it has worked fine.

borshop added a commit that referenced this pull request Dec 9, 2015
Ku/merge 2.0

Reviewed-by: kuenishi
@kuenishi
Copy link
Contributor Author

kuenishi commented Dec 9, 2015

@borshop merge

@borshop borshop merged commit 76f53c6 into 2.1 Dec 9, 2015
@kuenishi kuenishi deleted the ku/merge-2.0 branch December 9, 2015 03:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants