-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is a largely clean merge of the 2.1.7 tag into the develop-2.0 branch: * Some minor merge conflicts, mostly concerning dependencies (which will need to be revisited) and docs * Manually removed following features that went into 2.0: - Upgrade to Solr 4.10 - AAE throttling - Job control switches - Changes due to Riak 2.2 AAE hashing changes This change requires back port of riak_kv (TBD)
- Loading branch information
Showing
52 changed files
with
3,693 additions
and
2,548 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
minimum_reviewers: 2 | ||
build_steps: | ||
- make clean | ||
- make test | ||
- make xref | ||
- make dialyzer | ||
merge: false | ||
org_mode: true | ||
timeout: 1790 |
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
This file was deleted.
Oops, something went wrong.
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
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.