From fc600cc30b86781ef42c04f9ffec49597fdb95c6 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Sun, 13 Oct 2013 16:18:38 +0200 Subject: [PATCH 1/4] update travis-support for an amqp bunny config change --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e7bd1e46..7ddd46fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-support.git - revision: fffb09b3e6967cdb6c33f04ac7f7840a8df77400 + revision: df798c71815d09c3422f29fd90ad4a73deec0f44 specs: travis-support (0.0.1) From e15e3747b782896b55ee0da02070f7b84e30fe0b Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Sun, 13 Oct 2013 17:43:03 +0200 Subject: [PATCH 2/4] try using bunny 1.0.0.rc2 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 38c188c4..5690338f 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'rack-contrib', github: 'rack/rack-contrib' gem 'rack-cache', '~> 1.2' gem 'rack-attack' gem 'gh' -gem 'bunny', '~> 0.10.8' +gem 'bunny', '~> 1.0.0.rc2' gem 'dalli' gem 'pry' gem 'metriks', '0.9.9.5' diff --git a/Gemfile.lock b/Gemfile.lock index 7ddd46fe..09cf1966 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,8 +113,8 @@ GEM avl_tree (1.1.3) backports (2.8.2) builder (3.0.4) - bunny (0.10.8) - amq-protocol (>= 1.6.0) + bunny (1.0.0.rc2) + amq-protocol (>= 1.8.0) celluloid (0.12.4) facter (>= 1.6.12) timers (>= 1.0.0) @@ -277,7 +277,7 @@ PLATFORMS ruby DEPENDENCIES - bunny (~> 0.10.8) + bunny (~> 1.0.0.rc2) dalli database_cleaner (~> 0.8.0) factory_girl (~> 2.4.0) From 90c26dc111bb1310e97a4480bc9e4bb1015806de Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Sun, 13 Oct 2013 18:10:07 +0200 Subject: [PATCH 3/4] lets try 0.9.8 bunny --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 5690338f..449c454a 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'rack-contrib', github: 'rack/rack-contrib' gem 'rack-cache', '~> 1.2' gem 'rack-attack' gem 'gh' -gem 'bunny', '~> 1.0.0.rc2' +gem 'bunny', '~> 0.9.8' gem 'dalli' gem 'pry' gem 'metriks', '0.9.9.5' diff --git a/Gemfile.lock b/Gemfile.lock index 09cf1966..c9690673 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,8 +113,8 @@ GEM avl_tree (1.1.3) backports (2.8.2) builder (3.0.4) - bunny (1.0.0.rc2) - amq-protocol (>= 1.8.0) + bunny (0.9.8) + amq-protocol (>= 1.6.0) celluloid (0.12.4) facter (>= 1.6.12) timers (>= 1.0.0) @@ -277,7 +277,7 @@ PLATFORMS ruby DEPENDENCIES - bunny (~> 1.0.0.rc2) + bunny (~> 0.9.8) dalli database_cleaner (~> 0.8.0) factory_girl (~> 2.4.0) From ade4d4ad0116e7a6e77bdc36c89dad77b3e87b79 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Sun, 13 Oct 2013 18:16:01 +0200 Subject: [PATCH 4/4] back to bunny 0.8.x --- Gemfile | 2 +- Gemfile.lock | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 449c454a..d45932fd 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'rack-contrib', github: 'rack/rack-contrib' gem 'rack-cache', '~> 1.2' gem 'rack-attack' gem 'gh' -gem 'bunny', '~> 0.9.8' +gem 'bunny', '~> 0.8.0' gem 'dalli' gem 'pry' gem 'metriks', '0.9.9.5' diff --git a/Gemfile.lock b/Gemfile.lock index c9690673..4efcb15a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,14 +107,12 @@ GEM i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.5) - amq-protocol (1.8.0) arel (3.0.2) atomic (1.1.14) avl_tree (1.1.3) backports (2.8.2) builder (3.0.4) - bunny (0.9.8) - amq-protocol (>= 1.6.0) + bunny (0.8.0) celluloid (0.12.4) facter (>= 1.6.12) timers (>= 1.0.0) @@ -277,7 +275,7 @@ PLATFORMS ruby DEPENDENCIES - bunny (~> 0.9.8) + bunny (~> 0.8.0) dalli database_cleaner (~> 0.8.0) factory_girl (~> 2.4.0)