Merge lp:~cmars/juju-core/1.14-azure-compile-error into lp:juju-core/1.14

[Casey Marshall]

Noticed a compile error in the azure storage provider.

[John A Meinel (jameinel)]

Thanks, I honestly can't say how 1.14 ended up with this compile error. Perhaps we weren't managing the 1.14 branch with the bot yet.

I don't think there will be any future releases from this branch, but might as well allow it to build.

review: Approve

[John A Meinel (jameinel)]

Actually, this is only a compile error because of a newer gwacl version. The one used for the 1.14 series is older and the function GetAnonymousURL did not used to return an error.

The correct version to use for juju-1.14.1 is tagged "juju-1.14.1" in the lp:gwacl tree.

If you do "bzr diff -r tag:juju-1.14.1..-1" in lp:gwacl you can see they changed the signature. So not landing this as it would *break* building the 1.14 series with the original dependencies.

review: Disapprove

Unmerged revisions

1752. By Casey Marshall on 2013-10-07

Fix compile error in azureStorage.URL

=== modified file 'provider/azure/storage.go'
--- provider/azure/storage.go	2013-08-26 06:44:01 +0000
+++ provider/azure/storage.go	2013-10-07 17:43:18 +0000
@@ -93,7 +93,7 @@
 	if context.Key != "" {
 		// 10 years should be good enough.
 		expires := time.Now().AddDate(10, 0, 0)
-		return context.GetAnonymousFileURL(storage.getContainer(), name, expires), nil
+		return context.GetAnonymousFileURL(storage.getContainer(), name, expires)
 	}
 	return context.GetFileURL(storage.getContainer(), name), nil
 }