Ubuntu Pastebin

Paste from rog at Thu, 29 Sep 2016 13:49:03 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
diff --git a/apiserver/application/application.go b/apiserver/application/application.go
--- a/apiserver/application/application.go
+++ b/apiserver/application/application.go
-	curl, err := charm.ParseURL(args.CharmUrl)
+	curl, err := charm.ParseURL(args.CharmURL)
-	if !args.ForceCharmUrl {
+	if !args.ForceCharmURL {
-	if args.CharmUrl != "" {
+	if args.CharmURL != "" {
-			args.CharmUrl,
+			args.CharmURL,
-			args.ForceCharmUrl,
+			args.ForceCharmURL,
-		args.CharmUrl,
+		args.CharmURL,

diff --git a/apiserver/metricsender/metricsender.go b/apiserver/metricsender/metricsender.go
--- a/apiserver/metricsender/metricsender.go
+++ b/apiserver/metricsender/metricsender.go
-	defaultSender            MetricSender = &HttpSender{}
+	defaultSender            MetricSender = &HTTPSender{}

diff --git a/apiserver/metricsender/sender.go b/apiserver/metricsender/sender.go
--- a/apiserver/metricsender/sender.go
+++ b/apiserver/metricsender/sender.go
-// HttpSender is the default used for sending
+// HTTPSender is the default used for sending
-type HttpSender struct {
+type HTTPSender struct {
-func (s *HttpSender) Send(metrics []*wireformat.MetricBatch) (*wireformat.Response, error) {
+func (s *HTTPSender) Send(metrics []*wireformat.MetricBatch) (*wireformat.Response, error) {

diff --git a/apiserver/params/params.go b/apiserver/params/params.go
--- a/apiserver/params/params.go
+++ b/apiserver/params/params.go
-	CharmUrl         string                         `json:"charm-url"`
+	CharmURL         string                         `json:"charm-url"`
-	CharmUrl        string             `json:"charm-url"`
-	ForceCharmUrl   bool               `json:"force-charm-url"`
+	CharmURL        string             `json:"charm-url"`
+	ForceCharmURL   bool               `json:"force-charm-url"`
-	// CharmUrl is the new url for the charm.
-	CharmUrl string `json:"charm-url"`
+	// CharmURL is the new url for the charm.
+	CharmURL string `json:"charm-url"`
Download as text