Merge branch 'release-1.x'

OpenConext · Jul 29, 2015 · 2bbdb61 · 2bbdb61
2 parents 6049be0 + 26807fc
commit 2bbdb61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git 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

diff --git 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