You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2021/02/16 17:31:26 UTC
[couchdb-jiffy] 12/12: Merge remote-tracking branch 'davisp/master'
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-jiffy.git
commit 998b86258bfe30acf00832d2bc7c007a2210c0b8
Merge: 11ae49f 37039ba
Author: Robert Newson <rn...@apache.org>
AuthorDate: Tue Feb 16 17:30:06 2021 +0000
Merge remote-tracking branch 'davisp/master'
.gitignore | 1 +
.travis.yml | 1 +
Makefile | 4 ++++
c_src/jiffy.c | 1 +
c_src/jiffy.h | 1 +
c_src/util.c | 2 +-
enc | Bin 23313 -> 26053 bytes
src/jiffy.app.src | 2 +-
src/jiffy.erl | 2 ++
test/jiffy_15_return_trailer_tests.erl | 13 ++++++++++++-
test/jiffy_17_copy_strings_tests.erl | 2 +-
test/jiffy_util.hrl | 3 +++
12 files changed, 28 insertions(+), 4 deletions(-)
diff --cc .travis.yml
index 4a827cd,53bb22d..a53e42d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -1,6 -1,9 +1,7 @@@
language: erlang
-notifications:
- email: paul.joseph.davis@gmail.com
-script: make check
+
otp_release:
+ - 23.0
- 22.2.4
- 21.3.8.1
- 20.3.8.22