From a57e52462088276491d4a822c5b0093a720f4479 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 20 Jun 2014 19:08:16 -0700
Subject: [travis] disable osx until travis osx issues are resolved

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 16d178a24b..50d4e41593 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: cpp
 
 os:
  - linux
- - osx
 
 compiler:
  - gcc
-- 
cgit v1.2.1


From d8dba62a210909f1b6dff7c61ac82ea0358575f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Wed, 25 Jun 2014 16:03:09 +0200
Subject: change hipchat notifications

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 50d4e41593..35804dd7b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,9 +28,10 @@ script:
 notifications:
   hipchat:
     rooms:
-      secure: "ZKtTiFjXgXfrAO8eMU1nJBe46OBLgk0H7VAVmk84QwAb6DuoqT+mGMs+1yrWtjLwZI8vayZyaucupp1siM7lBWCOADx5GXA6GCCLOuE7fYLSNJFrXHa1u70IUBLOU8b5bDWRn8tcd5CM754R609l4ckTzBH3y4CIh9YNFrB0b+g="
+      secure: "GGP1hopxPUtKABYyMIzwu8nJco3r14RhYAlpzZwlj1Ypl3okRCHh51VxkMpmPb6WgPhjL4O7/AVxS2mDnAyMqKWdeW3wl9edirZu0kjROCfxRoeqEeLC1JLHLfjdpIvJVv++jnvp2xrw+YUMI24Y2klHvOMpHhm8+CLpmmpidfY="
     template:
-      - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}'
+      - 'Build <a href="%{build_url}">#%{build_number}</a>: %{author} tested <a href="%{compare_url}">%{commit}</a> in branch <a href="https://github.com/%{repository_slug}/tree/%{branch}">%{branch}</a> of <a href="https://github.com/%{repository_slug}">%{repository_name}</a>: <b>%{commit_message}</b><br>%{message} (%{duration})'
+    format: html
 
 git:
   submodules: false
-- 
cgit v1.2.1