Merge 2.0 branch into develop [JIRA: TOOLS-131] #178
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…based add support for custom exit codes to nodetool rpc & friends
`escript` does not process emulator/runtime arguments like `erl`, so you can't blindly pass an application environment setting on the command line. This meant that the `-kernel net_ticktime N` argument passed to nodetool was not functioning as intended and being treated as regular arguments, resulting in a crash. The net_ticktime setting is also a sensitive setting and should likely be set before the Erlang distribution is started. I can only assume that the original author that added it had intended for it to be loaded by the application_controller, as `erl` does. Therefore, this change handles net_ticktime specially in nodetool:process_args/3 and puts it as the first argument to the script so that it is set first.
Handle net_ticktime argument specially. Resolves RIAK-1281
Puts the `Replace:` and `Conflicts:` lines in the correct place
Fixes for debian control template
As per comments at basho/riak#693 (comment)
Make sure that locked deps are obeyed for packaging
|
Like a bad penny... |
|
👍 |
zeeshanlakhani
added a commit
that referenced
this pull request
Mar 19, 2015
Merge 2.0 branch into develop
|
Hey @zeeshanlakhani: I restored the 2.0 branch. It's not a good idea to remove release branches even if no further development is to happen on those yo. |
|
@engelsanchez fat-fingered... wouldn't do it on purpose :). |
|
create jira issue |
Basho-JIRA
changed the title
Basho-JIRA
added
JIRA: In Progress
JIRA: Needs Review
JIRA: Closed
and removed
JIRA: In Progress
JIRA: Needs Review
labels
ksauzz
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make
developbranch the focus of current development across all repos.TODO: Tag develop once merged.