Merge branch 'master' into 5.26

rc2
2021-09-21 13:28:17 -07:00 · 2021-09-21 12:36:10 -07:00 · 2021-09-21 12:35:52 -07:00 · 2021-09-21 12:20:56 -07:00 · 2021-09-21 11:56:36 -07:00
2 changed files with 2 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,4 @@
-# Unreleased
+# 5.26.0-rc.2
  - Changes from 5.25.0
    - API:
      - FIXED: Allow for special characters in the profile/method as part of the HTTP URL. [#6090](https://github.com/Project-OSRM/osrm-backend/pull/6090)
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "osrm",
-  "version": "5.26.0-unreleased",
+  "version": "5.26.0-rc.2",
  "private": false,
  "description": "The Open Source Routing Machine is a high performance routing engine written in C++14 designed to run on OpenStreetMap data.",
  "dependencies": {
Author	SHA1	Message	Date
Daniel Patterson	c3c7b6bdb1	Merge branch 'master' into 5.26	2021-09-21 13:28:17 -07:00
Daniel Patterson	a6bab049e9	rc2	2021-09-21 12:36:10 -07:00
Daniel Patterson	e2d0dc3d76	Merge branch 'master' into 5.26	2021-09-21 12:35:52 -07:00
Daniel Patterson	520135931e	Prep rc.1	2021-09-21 12:20:56 -07:00
Daniel Patterson	999daf9e94	Bookkeeping for 5.26.0 release.	2021-09-21 11:56:36 -07:00