From edac9ccd8b075ea1fedb6650fed00e2a45e6038d Mon Sep 17 00:00:00 2001
From: Pieter van der Meulen <pieter.vanderMeulen@surfnet.nl>
Date: Wed, 29 Jul 2015 19:35:18 +0200
Subject: [PATCH 1/2] Revert "Change version tag format to not include branch"

This reverts commit fb6679043cf589b130f109221ce33e8fab3c4ab8.
---
 .rmt.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.rmt.yml b/.rmt.yml
index 9dbb9b56d..05102d27e 100644
--- a/.rmt.yml
+++ b/.rmt.yml
@@ -20,7 +20,7 @@ _default:
     version-generator: semantic # More complex versionning (semantic)
     version-persister:
         vcs-tag:                           # Release with VCS tag
-            tag-prefix: ""   # Prefix any tag with the VCS branch name
+            tag-prefix: "{branch-name}_"   # Prefix any tag with the VCS branch name
             dump-commits: true
     pre-release-actions:
         changelog-update:          # Update a CHANGELOG file before the release

From 1d1e256c9605d5bb24fde1be470c48db6a79f71a Mon Sep 17 00:00:00 2001
From: Pieter van der Meulen <pieter.vanderMeulen@surfnet.nl>
Date: Wed, 29 Jul 2015 19:42:27 +0200
Subject: [PATCH 2/2] Update stepup-bundle to ^1.2.0

---
 composer.json |  2 +-
 composer.lock | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 3db96dc45..5679a9aec 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "surfnet/stepup-middleware-client-bundle": "^1.0",
         "guzzlehttp/guzzle": "~4",
         "surfnet/stepup-saml-bundle": "^1.3.0",
-        "surfnet/stepup-bundle": "dev-develop",
+        "surfnet/stepup-bundle": "^1.2.0",
         "symfony/swiftmailer-bundle": "~2.3"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 662ac5707..73130764b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "caa2c36aa199bf211ee8b45187371eb2",
+    "hash": "d8f3c728f4eded24e73ba510570e9435",
     "packages": [
         {
             "name": "beberlei/assert",
@@ -1740,16 +1740,16 @@
         },
         {
             "name": "surfnet/stepup-bundle",
-            "version": "dev-develop",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SURFnet/Stepup-bundle.git",
-                "reference": "68c62eb13e121fb4cb8124dbc69a3628a04fe1c1"
+                "reference": "144492c6c29a81d39178d8ab9876d81ae3b0cb63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SURFnet/Stepup-bundle/zipball/68c62eb13e121fb4cb8124dbc69a3628a04fe1c1",
-                "reference": "68c62eb13e121fb4cb8124dbc69a3628a04fe1c1",
+                "url": "https://api.github.com/repos/SURFnet/Stepup-bundle/zipball/144492c6c29a81d39178d8ab9876d81ae3b0cb63",
+                "reference": "144492c6c29a81d39178d8ab9876d81ae3b0cb63",
                 "shasum": ""
             },
             "require": {
@@ -1789,7 +1789,7 @@
                 "suaas",
                 "surfnet"
             ],
-            "time": "2015-07-28 11:35:26"
+            "time": "2015-07-29 15:18:35"
         },
         {
             "name": "surfnet/stepup-middleware-client-bundle",
@@ -4254,8 +4254,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "mopa/bootstrap-bundle": 20,
-        "surfnet/stepup-bundle": 20
+        "mopa/bootstrap-bundle": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,