From 9de25c784eee56a0732c3ab45243de31ef7ee293 Mon Sep 17 00:00:00 2001
From: Carolyn Van Slyck <me@carolynvanslyck.com>
Date: Mon, 6 Feb 2017 10:30:34 -0600
Subject: [PATCH 1/2] Bump libcarina

---
 glide.lock | 6 +++---
 glide.yaml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/glide.lock b/glide.lock
index 9509ab4..bb89dab 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 0dfd5276e4f5a8ae227bd72efba9b39fb57f4814b2b7b2f7fc19f4f4e0dc7c4e
-updated: 2017-02-03T10:34:03.651359382-06:00
+hash: c257c7fd57c183f96ddb0b95e65f9b736246bdfda08465fa1f5f8cccee7bac56
+updated: 2017-02-06T10:34:03.651359382-06:00
 imports:
 - name: github.com/davecgh/go-spew
   version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
@@ -8,7 +8,7 @@ imports:
 - name: github.com/fsnotify/fsnotify
   version: fd9ec7deca8bf46ecd2a795baaacf2b3a9be1197
 - name: github.com/getcarina/libcarina
-  version: 034a50e9612d92d88f0845b6fc37a310d53cdce0
+  version: 049d33fda7744ec46d49cc5525ec20d7d7cd0d8f
   repo: https://github.com/getcarina/libcarina.git
   vcs: git
 - name: github.com/getcarina/libmakeswarm
diff --git a/glide.yaml b/glide.yaml
index da46a71..1231d14 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -5,7 +5,7 @@ import:
   subpackages:
   - spew
 - package: github.com/getcarina/libcarina
-  version: 2.0.0-beta.2
+  version: 2.0.0
   repo: https://github.com/getcarina/libcarina.git
   vcs: git
 - package: github.com/getcarina/libmakeswarm

From ba0f42d18048348f1d6836f182fd8e15afdea036 Mon Sep 17 00:00:00 2001
From: Carolyn Van Slyck <me@carolynvanslyck.com>
Date: Mon, 6 Feb 2017 10:31:39 -0600
Subject: [PATCH 2/2] Standardize our UserAgent header

* Append, don't clobber the libcarina UserAgent value
* Use carina/VERSION
---
 common/constants.go | 2 +-
 make-coe/account.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/constants.go b/common/constants.go
index 4d85eb5..192a7e4 100644
--- a/common/constants.go
+++ b/common/constants.go
@@ -4,5 +4,5 @@ import "github.com/getcarina/carina/version"
 
 // BuildUserAgent generates the user agent for the Carina client
 func BuildUserAgent() string {
-	return "getcarina/carina " + version.Version
+	return " carina/" + version.Version
 }
diff --git a/make-coe/account.go b/make-coe/account.go
index e21eb95..03d3bc6 100644
--- a/make-coe/account.go
+++ b/make-coe/account.go
@@ -88,7 +88,7 @@ func (account *Account) Authenticate() (*libcarina.CarinaClient, error) {
 
 	// Apply our http client customizations
 	carinaClient.Client = common.NewHTTPClient()
-	carinaClient.UserAgent = common.BuildUserAgent()
+	carinaClient.UserAgent += common.BuildUserAgent()
 
 	// Cache data looked up from the service catalog
 	account.token = carinaClient.Token