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.

Sign up for GitHub

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

Develop 3.0 -> 3.1 merge #6

Open
wants to merge 53 commits into
base: develop-3.1
Choose a base branch
from
Open

Develop 3.0 -> 3.1 merge #6

Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
dcb46ea
Switch to branches with 292 and OTP 22 support
martinsumner Apr 9, 2020
c312eee
Uplift versions
martinsumner Apr 17, 2020
f8bc4f7
Tidy make test
martinsumner Apr 29, 2020
e159521
Include lager_syslog in the release. (#1019)
May 1, 2020
055a041
Update rebar.config to develop-3.0
martinsumner May 13, 2020
abc8c6d
Update riak_repl pointer
martinsumner May 14, 2020
3f152f1
draft 3.0 Release Notes
martinsumner May 29, 2020
d6f0355
Add default vm args in schema to prevent breaking in main process wit…
Jun 3, 2020
95691ec
Merge pull request #1018 from basho/develop-3.0-292
martinsumner Jun 16, 2020
98bfbda
Update RELEASE-NOTES.md
martinsumner Jun 19, 2020
7a47a9b
Update rebar.lock
martinsumner Jun 19, 2020
9cf5487
Support debian make
martinsumner Jun 30, 2020
de63a2b
Remove legacy files
martinsumner Jun 30, 2020
0990824
Try to avoid regressing make rel and make devrel
martinsumner Jul 1, 2020
6e1c5cc
Update vars.config
martinsumner Jul 1, 2020
4399acf
Update rebar.config
martinsumner Jul 1, 2020
f6e39f8
Update vars.config
martinsumner Jul 1, 2020
dd502f4
Temp repoint of riak_kv
martinsumner Jul 1, 2020
0ebbf73
Update vars.config
martinsumner Jul 1, 2020
3fd7dad
Tidy of vars.config
martinsumner Jul 1, 2020
4c1b92d
Avoid extra riak reference - as should be in repo tag
martinsumner Jul 1, 2020
23b4881
Use numeric part of tag as release in change log
martinsumner Jul 1, 2020
88c6008
Revert back to standard KV (change merged)
martinsumner Jul 1, 2020
3c8bc91
Update rebar.config
martinsumner Jul 1, 2020
4a408d5
Merge pull request #1023 from basho/mas-3.0-debianmake
martinsumner Jul 1, 2020
2b62099
Bring RPM packaging inline with DEB (#1024)
Jul 7, 2020
46a5cb8
script name is passed through from riak-admin to clique (#1025)
Jul 8, 2020
3ca35f1
Remove need for riakpre and riakrun
martinsumner Jul 8, 2020
ee63e44
Update rebar.config
martinsumner Jul 8, 2020
44a4b94
Update rebar.config
martinsumner Jul 8, 2020
9bee38c
Update riak
martinsumner Jul 8, 2020
463f82f
Update riak
martinsumner Jul 8, 2020
77b495c
Update riak
martinsumner Jul 8, 2020
d706f75
remove pre/run scripts from rpm specfile.
Jul 9, 2020
0e7e85d
Merge pull request #1026 from basho/mas-3.0-riakrunpath
martinsumner Jul 9, 2020
a68cd75
Update rebar.config
martinsumner Jul 9, 2020
e8567df
Merge pull request #1027 from basho/mas-3.0-yokoupdate
martinsumner Jul 9, 2020
3f75e07
Merge release notes with 2.9
martinsumner Jul 9, 2020
54702cf
Merge pull request #1028 from basho/mas-3.0-docupdate
martinsumner Jul 9, 2020
0b86770
rpm install to sbin (#1029)
Jul 10, 2020
614e694
stop copying init.d dir into /etc/riak - remove wildcard copy in rpm …
Jul 14, 2020
413e7af
Wrong run path for pid (#1032)
Jul 23, 2020
ebee307
Set run erl log maz size to higher default
martinsumner Aug 13, 2020
674ca25
Update rebar.lock
martinsumner Aug 13, 2020
c8f20c6
Attempt to force export of max log size
martinsumner Aug 17, 2020
0cae1c5
Define and export as pre-start hook
martinsumner Aug 17, 2020
5cea887
Merge pull request #1033 from basho/develop-3.0-defaultlogsize
martinsumner Aug 18, 2020
4afd6df
Updated rebar for release
martinsumner Aug 18, 2020
6bd729b
Correct release notes
martinsumner Aug 19, 2020
8caacaa
Merge pull request #1034 from basho/develop3.0-release
martinsumner Aug 19, 2020
d548ae8
Fix plugin tags
martinsumner Aug 20, 2020
dbd9d09
Update rebar.lock
martinsumner Aug 20, 2020
67f2cd1
Merge pull request #5 from basho/develop-3.0
Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update rebar.config
  • Loading branch information
@martinsumner
martinsumner committed Jul 8, 2020
commit 44a4b9468620e96703db093ca290a8150c0e6507
2 changes: 1 addition & 1 deletion rebar.config
View file
Original file line number Diff line number Diff line change
@@ -134,7 +134,7 @@
{relx, [
{overlay_vars, "rel/pkg/rpm/vars.config"},
{overlay, [
{template, "rel/files/riak", "usr/bin/riak"}
{template, "rel/files/riak", "usr/bin/riak"},
{template, "rel/pkg/rpm/init.script", "etc/init.d/init.script"}
]},
{extended_start_script_hooks,