Merge pull request #85 from GeoNode/master

- 2.10 stable release
GeoNode · Jul 10, 2019 · a2d3015 · a2d3015
2 parents 5a3f2e4 + 29a9d8c
commit a2d3015
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/README.rst b/README.rst
@@ -25,7 +25,7 @@ To setup your project using a local python virtual environment, follow these ins
 
   .. code:: bash
 
-    git clone https://github.com/GeoNode/geonode-project.git -b master
+    git clone https://github.com/GeoNode/geonode-project.git -b 2.10.x
     mkvirtualenv my_geonode
     pip install Django==1.11.21
 
@@ -76,7 +76,7 @@ You need Docker 1.12 or higher, get the latest stable official release for your
 
   .. code:: bash
 
-    git clone https://github.com/GeoNode/geonode-project.git -b master
+    git clone https://github.com/GeoNode/geonode-project.git -b 2.10.x
     mkvirtualenv my_geonode
     pip install Django==1.11.21
 

diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -57,7 +57,7 @@ services:
       - ./scripts/docker/env/development/celery.env
 
   geoserver:
-    image: geonode/geoserver:2.14.x
+    image: geonode/geoserver:2.14.3
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true
@@ -116,7 +116,7 @@ services:
 
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.14.x
+    image: geonode/geoserver_data:2.14.3
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - ./scripts/docker/env/production/db.env
 
   geoserver:
-    image: geonode/geoserver:2.14.x
+    image: geonode/geoserver:2.14.3
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true
@@ -71,7 +71,7 @@ services:
       - statics:/mnt/volumes/statics
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.14.x
+    image: geonode/geoserver_data:2.14.3
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:

diff --git a/project_name/__init__.py b/project_name/__init__.py
@@ -20,7 +20,7 @@
 
 import os
 
-__version__ = (2, 10, 0, 'rc', 4)
+__version__ = (2, 10, 0, 'final', 0)
 
 
 default_app_config = "{{project_name}}.apps.AppConfig"

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
 # GeoNode
--e git+https://github.com/GeoNode/geonode.git@master#egg=geonode
+GeoNode==2.10