From 921a82b359c1a51185b8384710cf95e557e47de6 Mon Sep 17 00:00:00 2001 From: Anthony Truskinger Date: Mon, 20 Feb 2017 15:23:42 +1000 Subject: [PATCH] Update dependencies baw-workeds fixed a bug when harvesting. --- Gemfile | 2 +- Gemfile.lock | 4 ++-- git-flow.md | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index cb532b86..834561dc 100644 --- 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 index b81520d8..655a16b1 100644 --- 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 index 57368d64..bc514544 100644 --- a/git-flow.md +++ b/git-flow.md @@ -84,9 +84,10 @@ git checkout -b release- develop git commit -am "increment version to " git checkout master git merge --no-ff release- -git tag -a +git tag -a -m "Version " git checkout develop git merge --no-ff release- +git branch -d release- git push --tags git push ``` \ No newline at end of file