Merge branches 'master' and 'v0.9' of https://github.com/jookies/jasmin…

… into v0.9
jookies · Nov 10, 2016 · 9a571e0 · 9a571e0
2 parents 90add00 + b29ed64
commit 9a571e0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: python
 python:
     - '2.7'
 env:
-    - ROOT_PATH=~/jasmin JASMIN_RELEASE=0.9b13
+    - ROOT_PATH=~/jasmin JASMIN_RELEASE=0.9b14
 # Command to install dependencies
 install:
     - python setup.py sdist

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Jookies LTD <jasmin@jookies.net>
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r jasmin && useradd -r -g jasmin jasmin
 
-ENV JASMIN_VERSION 0.9b13
+ENV JASMIN_VERSION 0.9b14
 
 # Install requirements
 RUN apt-get update && apt-get install -y \

diff --git a/jasmin/__init__.py b/jasmin/__init__.py
@@ -5,7 +5,7 @@
 
 MAJOR = 0
 MINOR = 9
-PATCH = 13
+PATCH = 14
 META = 'b'
 
 def get_version():

diff --git a/misc/config/systemd/jasmind.service b/misc/config/systemd/jasmind.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Jasmin SMS Gateway
-Requires=network.target interceptord.service
+Requires=network.target jasmin-interceptord.service jasmin-dlrd.service
 After=network.target
 
 [Service]

diff --git a/misc/doc/sources/conf.py b/misc/doc/sources/conf.py
@@ -38,7 +38,7 @@
 # The short X.Y version.
 version = "0.9"
 # The full version, including alpha/beta/rc tags.
-release = "0.9.13-beta"
+release = "0.9.14-beta"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.