Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
cjsmeele committed Jun 24, 2019
2 parents 1e2c3e4 + f1868bd commit 1827857
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)

project(davrods C)

set(IRODSRT_VERSION "4.2.5" CACHE STRING "iRODS client library version")
set(IRODSRT_VERSION "4.2.6" CACHE STRING "iRODS client library version")

set(DAVRODS_FEATURE "1.4.2")
set(DAVRODS_VERSION "${IRODSRT_VERSION}_${DAVRODS_FEATURE}")
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Please choose the right version for your platform:

| Davrods ver. | iRODS runtime ver. | Packages |
| ------------ | ------------------ | --------------------------------------------------------------------------------- |
| 1.4.2 | 4.2.6 | [RPM, DEB](https://github.com/UtrechtUniversity/davrods/releases/tag/4.2.6_1.4.2) |
| 1.4.2 | 4.2.5 | [RPM, DEB](https://github.com/UtrechtUniversity/davrods/releases/tag/4.2.5_1.4.2) |
| 1.4.2 | 4.2.4 | [RPM, DEB](https://github.com/UtrechtUniversity/davrods/releases/tag/4.2.4_1.4.2) |
| 1.4.1 | 4.2.3 | [RPM, DEB](https://github.com/UtrechtUniversity/davrods/releases/tag/4.2.3_1.4.1) |
Expand Down Expand Up @@ -82,9 +83,9 @@ package using the RPM or DEB file from the
Download the Davrods package for your platform and install it using your
package manager, for example:

yum install davrods-4.2.5_1.4.2-1.rpm
yum install davrods-4.2.6_1.4.2-1.rpm
--or--
apt install davrods-4.2.5_1.4.2.deb
apt install davrods-4.2.6_1.4.2.deb

Now see the __Configuration__ section for instructions on how to
configure Davrods once it has been installed.
Expand Down
3 changes: 3 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Sun Jun 23 2019 Chris Smeele <[email protected]> - 4.2.6_1.4.2-1
- Now supports iRODS 4.2.6 client libraries

* Wed Apr 03 2019 Chris Smeele <[email protected]> - 4.2.5_1.4.2-1
- Now supports iRODS 4.2.5 client libraries

Expand Down

0 comments on commit 1827857

Please sign in to comment.