Update dependencies

baw-workeds fixed a bug when harvesting.
QutEcoacoustics · Feb 20, 2017 · 921a82b · 921a82b
1 parent 6c2864a
commit 921a82b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -137,7 +137,7 @@ gem 'resque', '~> 1.25.2'
 gem 'resque-job-stats', git: 'https://github.com/echannel/resque-job-stats.git', branch: :master, ref: '8932c036ae'
 gem 'resque-status', '~> 0.5.0'
 # set to a specific commit when releasing to master branch
-gem 'baw-workers', git: 'https://github.com/QutBioacoustics/baw-workers.git', branch: :master, ref: 'b825d00e12e14a30f0358cff173fc1a26e6d73c6'
+gem 'baw-workers', git: 'https://github.com/QutBioacoustics/baw-workers.git', branch: :master, ref: '54f28d351a5ba7ff0cfab45bce6ba8d645a9599b'
 
 
 # Gems restricted by environment and/or platform

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -19,8 +19,8 @@ GIT
 
 GIT
   remote: https://github.com/QutBioacoustics/baw-workers.git
-  revision: b825d00e12e14a30f0358cff173fc1a26e6d73c6
-  ref: b825d00e12e14a30f0358cff173fc1a26e6d73c6
+  revision: 54f28d351a5ba7ff0cfab45bce6ba8d645a9599b
+  ref: 54f28d351a5ba7ff0cfab45bce6ba8d645a9599b
   branch: master
   specs:
     baw-workers (0.5.0)

diff --git a/git-flow.md b/git-flow.md
@@ -84,9 +84,10 @@ git checkout -b release-<version> develop
 git commit -am "increment version to <version>"
 git checkout master
 git merge --no-ff release-<version>
-git tag -a <version>
+git tag -a <version> -m "Version <version>"
 git checkout develop
 git merge --no-ff release-<version>
+git branch -d release-<version>
 git push --tags
 git push
 ```