From 6910d6f243ce21d6196c3d5455cc05b5fc92e7f0 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Fri, 9 Aug 2013 17:55:59 +0200
Subject: [PATCH] Bump travis-core (use master branch)

---
 Gemfile      |  2 +-
 Gemfile.lock | 47 +++++++++++++++++++++++------------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/Gemfile b/Gemfile
index aa3d5661..4ebc17f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '1.9.3' rescue nil
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'ps-cancel'
+gem 'travis-core',     github: 'travis-ci/travis-core'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 gem 'sinatra'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8de84c79..c2466d33 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,8 +31,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: fa4e4051d35da428d9d67e1c2e2230568f3c2653
-  branch: ps-cancel
+  revision: 9adeb30c03674452d09fc551f5e61d40e70e6c72
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.12)
@@ -90,12 +89,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -103,20 +102,20 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
     arel (3.0.2)
-    atomic (1.1.10)
+    atomic (1.1.12)
     avl_tree (1.1.3)
     backports (2.8.2)
     builder (3.0.4)
@@ -140,8 +139,8 @@ GEM
     facter (1.7.2)
     factory_girl (2.4.2)
       activesupport
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     ffi (1.9.0)
     foreman (0.63.0)
       dotenv (>= 0.7)
@@ -157,7 +156,7 @@ GEM
     hashr (0.0.22)
     hike (1.2.3)
     hitimes (1.2.1)
-    i18n (0.6.1)
+    i18n (0.6.5)
     journey (1.0.4)
     json (1.8.0)
     listen (1.2.2)
@@ -176,9 +175,9 @@ GEM
     mime-types (1.23)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.7)
+    multi_json (1.7.9)
     multipart-post (1.2.0)
-    net-http-persistent (2.8)
+    net-http-persistent (2.9)
     net-http-pipeline (1.0.1)
     newrelic_rpm (3.6.1.88)
     pg (0.13.2)
@@ -203,9 +202,9 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)