Skip to content

Commit

Permalink
Merge pull request #936 from pgRouting/release/2.5
Browse files Browse the repository at this point in the history 
Release/2.5 rc
  • Loading branch information
@cvvergara
cvvergara authored Sep 6, 2017
2 parents e5cb78d + 33be653 commit 672bc67
Show file tree
Hide file tree
Showing 19 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ endif()
set(PGROUTING_VERSION_MAJOR "2")
set(PGROUTING_VERSION_MINOR "5")
set(PGROUTING_VERSION_PATCH "0")
set(PGROUTING_VERSION_DEV "-beta")
set(PGROUTING_VERSION_DEV "-rc")

set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
set(PGROUTING_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}.${PGROUTING_VERSION_PATCH}")
Expand Down
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@

### Branches

* The *master* branch has the pre-release 2.5.0-beta
* The *develop* branch has the next pre-release. 2.5.0-rc
* The *master* branch has the pre-release 2.5.0-rc
* The *release/2.5* branch has the next release 2.5.0 (Date of release Sept-13-2017)
* The *develop* branch has the development of the next minor-release. 2.6.0-dev

For the complete list of releases go to:
https://github.com/pgRouting/pgrouting/releases
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Main configuration
# ------------------------------------------------------------------------------

version: 2.4.{build}
version: 2.5.{build}

image: Visual Studio 2013
configuration: Release
Expand Down
2 changes: 1 addition & 1 deletion doc/src/pgRouting-introduction.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pgRouting is an `OSGeo Labs <http://wiki.osgeo.org/wiki/OSGeo_Labs>`_ project of

.. _license:

License
Licensing
-------------------------------------------------------------------------------

The following licenses can be found in pgRouting:
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.0.0--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.0.1--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.1.0--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.2.0--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.2.1--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.2.2--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.2.3--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.2.4--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.3.0--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.3.1--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.3.2--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.4.0--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.4.1--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.4.2--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.5.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ RETURNS TABLE(
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0-beta'::varchar AS tag,
'v2.5.0-rc'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
'1.54.0'::varchar AS boost;
Expand Down

0 comments on commit 672bc67

Please sign in to comment.