Merge pull request #1341 from anarkiwi/master

Bump version for release and upgrade Ryu to 4.20
faucetsdn · Dec 3, 2017 · f75d85a · f75d85a
2 parents 05c6302 + 65d8918
commit f75d85a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 Faucet
 ======
 
-:version: 1.6.11
+:version: 1.6.12
 
 .. image:: https://travis-ci.org/faucetsdn/faucet.svg?branch=master
     :target: https://travis-ci.org/faucetsdn/faucet

diff --git a/docker-compose-pi.yaml b/docker-compose-pi.yaml
@@ -45,7 +45,7 @@ services:
         build:
             context: .
             dockerfile: Dockerfile.pi-gauge
-        image: 'faucet/gauge-pi:1.6.11'
+        image: 'faucet/gauge-pi:1.6.12'
         environment:
             GAUGE_CONFIG: '/etc/ryu/faucet/gauge.yaml'
         volumes:
@@ -62,7 +62,7 @@ services:
         build:
             context: .
             dockerfile: Dockerfile.pi
-        image: 'faucet/faucet-pi:1.6.11'
+        image: 'faucet/faucet-pi:1.6.12'
         volumes:
             - '${FAUCET_PREFIX}/var/log/ryu/faucet:/var/log/ryu/faucet'
             - '${FAUCET_PREFIX}/etc/ryu/faucet:/etc/ryu/faucet'

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -53,7 +53,7 @@ services:
         build:
             context: .
             dockerfile: Dockerfile.gauge
-        image: 'faucet/gauge:1.6.11'
+        image: 'faucet/gauge:1.6.12'
         environment:
             GAUGE_CONFIG: '/etc/ryu/faucet/gauge.yaml'
         volumes:
@@ -71,7 +71,7 @@ services:
         build:
             context: .
             dockerfile: Dockerfile
-        image: 'faucet/faucet:1.6.11'
+        image: 'faucet/faucet:1.6.12'
         volumes:
             - '${FAUCET_PREFIX}/var/log/ryu/faucet:/var/log/ryu/faucet'
             - '${FAUCET_PREFIX}/etc/ryu/faucet:/etc/ryu/faucet'

diff --git a/requirements.txt b/requirements.txt
@@ -6,4 +6,4 @@ networkx
 pbr>=1.9
 prometheus_client
 pyyaml
-ryu==4.19
+ryu==4.20
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -12,4 +12,4 @@ pylint
 pytest-cov
 pyyaml
 requests
-ryu==4.19
+ryu==4.20