Merge lp:~natefinch/juju-core/fix-win-bootstrap into lp:~go-bot/juju-core/trunk

[Nate Finch]

merge windows fix back to trunk

=== modified file 'charm/repo.go'
--- charm/repo.go	2013-07-09 10:32:23 +0000
+++ charm/repo.go	2013-10-17 18:24:24 +0000
@@ -17,6 +17,7 @@
 	"strings"
 
 	"launchpad.net/juju-core/log"
+	"launchpad.net/juju-core/utils"
 )
 
 // CacheDir stores the charm cache directory path.
@@ -257,7 +258,7 @@
 			os.Remove(dlPath)
 			return nil, err
 		}
-		if err := os.Rename(dlPath, path); err != nil {
+		if err := utils.ReplaceFile(dlPath, path); err != nil {
 			return nil, err
 		}
 	}

=== modified file 'cmd/plugins/juju-metadata/validateimagemetadata_test.go'
--- cmd/plugins/juju-metadata/validateimagemetadata_test.go	2013-10-17 05:37:00 +0000
+++ cmd/plugins/juju-metadata/validateimagemetadata_test.go	2013-10-17 18:24:24 +0000
@@ -19,9 +19,14 @@
 )
 
 type ValidateImageMetadataSuite struct {
+<<<<<<< TREE
 	testbase.LoggingSuite
 	home        *coretesting.FakeHome
 	metadataDir string
+=======
+	testbase.LoggingSuite
+	home *coretesting.FakeHome
+>>>>>>> MERGE-SOURCE
 }
 
 var _ = gc.Suite(&ValidateImageMetadataSuite{})
@@ -89,6 +94,10 @@
 environments:
     ec2:
         type: ec2
+<<<<<<< TREE
+=======
+        control-bucket: foo
+>>>>>>> MERGE-SOURCE
         default-series: precise
         region: us-east-1
 
@@ -102,11 +111,22 @@
 `
 
 func (s *ValidateImageMetadataSuite) SetUpTest(c *gc.C) {
+<<<<<<< TREE
 	s.LoggingSuite.SetUpTest(c)
 	s.metadataDir = c.MkDir()
+=======
+	s.LoggingSuite.SetUpTest(c)
+>>>>>>> MERGE-SOURCE
 	s.home = coretesting.MakeFakeHome(c, metadataTestEnvConfig)
+<<<<<<< TREE
 	s.PatchEnvironment("AWS_ACCESS_KEY_ID", "access")
 	s.PatchEnvironment("AWS_SECRET_ACCESS_KEY", "secret")
+=======
+	restore := testbase.PatchEnvironment("AWS_ACCESS_KEY_ID", "access")
+	s.AddCleanup(func(*gc.C) { restore() })
+	restore = testbase.PatchEnvironment("AWS_SECRET_ACCESS_KEY", "secret")
+	s.AddCleanup(func(*gc.C) { restore() })
+>>>>>>> MERGE-SOURCE
 }
 
 func (s *ValidateImageMetadataSuite) TearDownTest(c *gc.C) {
@@ -135,6 +155,7 @@
 	c.Check(strippedOut, gc.Matches, `matching image ids for region "us-east-1":.*`)
 }
 
+<<<<<<< TREE
 func (s *ValidateImageMetadataSuite) TestEc2LocalMetadataUsingIncompleteEnvironment(c *gc.C) {
 	testbase.PatchEnvironment("AWS_ACCESS_KEY_ID", "")
 	testbase.PatchEnvironment("AWS_SECRET_ACCESS_KEY", "")
@@ -151,6 +172,23 @@
 	c.Check(strippedOut, gc.Matches, `error: environment has no access-key or secret-key`)
 }
 
+=======
+func (s *ValidateImageMetadataSuite) TestEc2LocalMetadataUsingIncompleteEnvironment(c *gc.C) {
+	testbase.PatchEnvironment("AWS_ACCESS_KEY_ID", "")
+	testbase.PatchEnvironment("AWS_SECRET_ACCESS_KEY", "")
+	s.setupEc2LocalMetadata(c, "us-east-1")
+	ctx := coretesting.Context(c)
+	metadataDir := config.JujuHomePath("")
+	code := cmd.Main(
+		&ValidateImageMetadataCommand{}, ctx, []string{"-e", "ec2", "-d", metadataDir},
+	)
+	c.Assert(code, gc.Equals, 1)
+	errOut := ctx.Stderr.(*bytes.Buffer).String()
+	strippedOut := strings.Replace(errOut, "\n", "", -1)
+	c.Check(strippedOut, gc.Matches, `error: environment has no access-key or secret-key`)
+}
+
+>>>>>>> MERGE-SOURCE
 func (s *ValidateImageMetadataSuite) TestEc2LocalMetadataWithManualParams(c *gc.C) {
 	s.setupEc2LocalMetadata(c, "us-west-1")
 	ctx := coretesting.Context(c)

=== modified file 'environs/configstore/disk.go'
--- environs/configstore/disk.go	2013-10-02 15:39:37 +0000
+++ environs/configstore/disk.go	2013-10-17 18:24:24 +0000
@@ -199,7 +199,7 @@
 	if err != nil {
 		return fmt.Errorf("cannot write temporary file: %v", err)
 	}
-	if err := os.Rename(tmpFile.Name(), info.path); err != nil {
+	if err := utils.ReplaceFile(tmpFile.Name(), info.path); err != nil {
 		os.Remove(tmpFile.Name())
 		return fmt.Errorf("cannot rename new environment info file: %v", err)
 	}

=== modified file 'environs/filestorage/filestorage.go'
--- environs/filestorage/filestorage.go	2013-09-20 04:41:12 +0000
+++ environs/filestorage/filestorage.go	2013-10-17 18:24:24 +0000
@@ -151,7 +151,7 @@
 		os.Remove(file.Name())
 		return err
 	}
-	return os.Rename(file.Name(), fullpath)
+	return utils.ReplaceFile(file.Name(), fullpath)
 }
 
 func (f *fileStorageWriter) Remove(name string) error {

=== modified file 'environs/imagemetadata/simplestreams.go'
=== modified file 'environs/imagemetadata/simplestreams_test.go'
=== modified file 'environs/simplestreams/simplestreams.go'
=== modified file 'environs/sync/sync.go'
--- environs/sync/sync.go	2013-10-16 05:26:30 +0000
+++ environs/sync/sync.go	2013-10-17 18:24:24 +0000
@@ -174,6 +174,16 @@
 	sha256hash.Write(buf.Bytes())
 	tool.SHA256 = fmt.Sprintf("%x", sha256hash.Sum(nil))
 	tool.Size = nBytes
+
+	// TODO(wallyworld) - 2013-10-09 bug=1237130
+	// This is a 1.16 only hack to allow upgrades from 1.14 to work.
+	// Remove once 1.16 is released.
+	legacyBuf := bytes.NewBuffer(buf.Bytes())
+	legacyName := "tools/juju-" + tool.Version.String() + ".tgz"
+	err = dest.Put(legacyName, legacyBuf, nBytes)
+	if err != nil {
+		return fmt.Errorf("writing tools to legacy location: %v", err)
+	}
 	return dest.Put(toolsName, buf, nBytes)
 }
 

=== modified file 'environs/sync/sync_test.go'
--- environs/sync/sync_test.go	2013-10-10 11:40:54 +0000
+++ environs/sync/sync_test.go	2013-10-17 18:24:24 +0000
@@ -182,11 +182,36 @@
 				s.targetEnv, test.ctx.MajorVersion, test.ctx.MinorVersion, coretools.Filter{}, envtools.DoNotAllowRetry)
 			c.Assert(err, gc.IsNil)
 			assertToolsList(c, targetTools, test.tools)
-			assertNoUnexpectedTools(c, s.targetEnv.Storage())
+<<<<<<< TREE
+			assertNoUnexpectedTools(c, s.targetEnv.Storage())
+=======
+
+			// TODO(wallyworld) - 2013-10-09 bug=1237130
+			// This is a 1.16 only hack to allow upgrades from 1.14 to work.
+			// Remove once 1.16 is released.
+			assertLegacyTools(c, s.targetEnv.Storage(), test.tools)
+
+			assertNoUnexpectedTools(c, s.targetEnv.Storage())
+>>>>>>> MERGE-SOURCE
 		}()
 	}
 }
 
+func assertLegacyTools(c *gc.C, stor storage.StorageReader, expected []version.Binary) {
+	files, err := stor.List("tools/juju-")
+	c.Assert(err, gc.IsNil)
+	c.Assert(len(files), gc.Equals, len(expected))
+	for _, vers := range expected {
+		filename := "tools/juju-" + vers.String() + ".tgz"
+		r, err := stor.Get(filename)
+		c.Check(err, gc.IsNil)
+		defer r.Close()
+		data, err := ioutil.ReadAll(r)
+		c.Check(err, gc.IsNil)
+		c.Check(string(data), gc.Equals, vers.String())
+	}
+}
+
 var (
 	v100p64 = version.MustParseBinary("1.0.0-precise-amd64")
 	v100q64 = version.MustParseBinary("1.0.0-quantal-amd64")

=== modified file 'environs/tools/simplestreams.go'
=== modified file 'environs/tools/simplestreams_test.go'
--- environs/tools/simplestreams_test.go	2013-10-16 05:26:30 +0000
+++ environs/tools/simplestreams_test.go	2013-10-17 18:24:24 +0000
@@ -7,8 +7,13 @@
 	"bytes"
 	"flag"
 	"fmt"
+<<<<<<< TREE
 	"io"
 	"net/http"
+=======
+	"net/http"
+	"path/filepath"
+>>>>>>> MERGE-SOURCE
 	"reflect"
 	"strings"
 	"testing"
@@ -477,6 +482,7 @@
 	c.Assert(item, gc.FitsTypeOf, &tools.ToolsMetadata{})
 	c.Assert(item.(*tools.ToolsMetadata).Size, gc.Equals, int64(9223372036854775807))
 }
+<<<<<<< TREE
 
 type metadataHelperSuite struct {
 	testbase.LoggingSuite
@@ -795,3 +801,110 @@
  "format": "products:1.0"
 }
 `
+=======
+
+type signedSuite struct {
+	origKey string
+}
+
+var testRoundTripper *jujutest.ProxyRoundTripper
+
+func init() {
+	testRoundTripper = &jujutest.ProxyRoundTripper{}
+	simplestreams.RegisterProtocol("signedtest", testRoundTripper)
+}
+
+func (s *signedSuite) SetUpSuite(c *gc.C) {
+	var imageData = map[string]string{
+		"/unsigned/streams/v1/index.json":          unsignedIndex,
+		"/unsigned/streams/v1/tools_metadata.json": unsignedProduct,
+	}
+
+	// Set up some signed data from the unsigned data.
+	// Overwrite the product path to use the sjson suffix.
+	rawUnsignedIndex := strings.Replace(
+		unsignedIndex, "streams/v1/tools_metadata.json", "streams/v1/tools_metadata.sjson", -1)
+	r := bytes.NewReader([]byte(rawUnsignedIndex))
+	signedData, err := simplestreams.Encode(
+		r, sstesting.SignedMetadataPrivateKey, sstesting.PrivateKeyPassphrase)
+	c.Assert(err, gc.IsNil)
+	imageData["/signed/streams/v1/index.sjson"] = string(signedData)
+
+	// Replace the tools path in the unsigned data with a different one so we can test that the right
+	// tools path is used.
+	rawUnsignedProduct := strings.Replace(
+		unsignedProduct, "juju-1.13.0", "juju-1.13.1", -1)
+	r = bytes.NewReader([]byte(rawUnsignedProduct))
+	signedData, err = simplestreams.Encode(
+		r, sstesting.SignedMetadataPrivateKey, sstesting.PrivateKeyPassphrase)
+	c.Assert(err, gc.IsNil)
+	imageData["/signed/streams/v1/tools_metadata.sjson"] = string(signedData)
+	testRoundTripper.Sub = jujutest.NewCannedRoundTripper(
+		imageData, map[string]int{"signedtest://unauth": http.StatusUnauthorized})
+	s.origKey = tools.SetSigningPublicKey(sstesting.SignedMetadataPublicKey)
+}
+
+func (s *signedSuite) TearDownSuite(c *gc.C) {
+	testRoundTripper.Sub = nil
+	tools.SetSigningPublicKey(s.origKey)
+}
+
+func (s *signedSuite) TestSignedToolsMetadata(c *gc.C) {
+	signedSource := simplestreams.NewURLDataSource("signedtest://host/signed", simplestreams.VerifySSLHostnames)
+	toolsConstraint := tools.NewVersionedToolsConstraint("1.13.0", simplestreams.LookupParams{
+		CloudSpec: simplestreams.CloudSpec{"us-east-1", "https://ec2.us-east-1.amazonaws.com"},
+		Series:    []string{"precise"},
+		Arches:    []string{"amd64"},
+	})
+	toolsMetadata, err := tools.Fetch(
+		[]simplestreams.DataSource{signedSource}, simplestreams.DefaultIndexPath, toolsConstraint, true)
+	c.Assert(err, gc.IsNil)
+	c.Assert(len(toolsMetadata), gc.Equals, 1)
+	c.Assert(toolsMetadata[0].Path, gc.Equals, "tools/releases/20130806/juju-1.13.1-precise-amd64.tgz")
+}
+
+var unsignedIndex = `
+{
+ "index": {
+  "com.ubuntu.juju:released:tools": {
+   "updated": "Mon, 05 Aug 2013 11:07:04 +0000",
+   "datatype": "content-download",
+   "format": "products:1.0",
+   "products": [
+     "com.ubuntu.juju:12.04:amd64"
+   ],
+   "path": "streams/v1/tools_metadata.json"
+  }
+ },
+ "updated": "Wed, 01 May 2013 13:31:26 +0000",
+ "format": "index:1.0"
+}
+`
+var unsignedProduct = `
+{
+ "updated": "Wed, 01 May 2013 13:31:26 +0000",
+ "content_id": "com.ubuntu.cloud:released:aws",
+ "datatype": "content-download",
+ "products": {
+   "com.ubuntu.juju:12.04:amd64": {
+    "arch": "amd64",
+    "release": "precise",
+    "versions": {
+     "20130806": {
+      "items": {
+       "1130preciseamd64": {
+        "version": "1.13.0",
+        "size": 2973595,
+        "path": "tools/releases/20130806/juju-1.13.0-precise-amd64.tgz",
+        "ftype": "tar.gz",
+        "sha256": "447aeb6a934a5eaec4f703eda4ef2dde"
+       }
+      }
+     }
+    }
+   }
+ },
+ "format": "products:1.0"
+}
+`
+>>>>>>> MERGE-SOURCE

=== modified file 'provider/maas/instance_test.go'
--- provider/maas/instance_test.go	2013-10-15 16:16:59 +0000
+++ provider/maas/instance_test.go	2013-10-17 18:24:24 +0000
@@ -95,49 +95,97 @@
 
 	addr, err := inst.Addresses()
 
-	c.Assert(err, gc.IsNil)
-	c.Check(addr, gc.DeepEquals, expected)
-}
-
-func (s *instanceTest) TestAddressesMissing(c *gc.C) {
-	// Older MAAS versions do not have ip_addresses returned, for these
-	// just the DNS name should be returned without error.
-	jsonValue := `{
-		"hostname": "testing.invalid",
-		"system_id": "system_id"
-		}`
-	obj := s.testMAASObject.TestServer.NewNode(jsonValue)
-	inst := maasInstance{&obj, s.makeEnviron()}
-
-	addr, err := inst.Addresses()
-	c.Assert(err, gc.IsNil)
-	c.Check(addr, gc.DeepEquals, []instance.Address{
-		{Value: "testing.invalid", Type: instance.HostName, NetworkScope: instance.NetworkPublic},
-	})
-}
-
-func (s *instanceTest) TestAddressesInvalid(c *gc.C) {
-	jsonValue := `{
-		"hostname": "testing.invalid",
-		"system_id": "system_id",
-		"ip_addresses": "incompatible"
-		}`
-	obj := s.testMAASObject.TestServer.NewNode(jsonValue)
-	inst := maasInstance{&obj, s.makeEnviron()}
-
-	_, err := inst.Addresses()
-	c.Assert(err, gc.NotNil)
-}
-
-func (s *instanceTest) TestAddressesInvalidContents(c *gc.C) {
-	jsonValue := `{
-		"hostname": "testing.invalid",
-		"system_id": "system_id",
-		"ip_addresses": [42]
-		}`
-	obj := s.testMAASObject.TestServer.NewNode(jsonValue)
-	inst := maasInstance{&obj, s.makeEnviron()}
-
-	_, err := inst.Addresses()
-	c.Assert(err, gc.NotNil)
+<<<<<<< TREE
+	c.Assert(err, gc.IsNil)
+	c.Check(addr, gc.DeepEquals, expected)
+}
+
+func (s *instanceTest) TestAddressesMissing(c *gc.C) {
+	// Older MAAS versions do not have ip_addresses returned, for these
+	// just the DNS name should be returned without error.
+	jsonValue := `{
+		"hostname": "testing.invalid",
+		"system_id": "system_id"
+		}`
+	obj := s.testMAASObject.TestServer.NewNode(jsonValue)
+	inst := maasInstance{&obj, s.makeEnviron()}
+
+	addr, err := inst.Addresses()
+	c.Assert(err, gc.IsNil)
+	c.Check(addr, gc.DeepEquals, []instance.Address{
+		{Value: "testing.invalid", Type: instance.HostName, NetworkScope: instance.NetworkPublic},
+	})
+}
+
+func (s *instanceTest) TestAddressesInvalid(c *gc.C) {
+	jsonValue := `{
+		"hostname": "testing.invalid",
+		"system_id": "system_id",
+		"ip_addresses": "incompatible"
+		}`
+	obj := s.testMAASObject.TestServer.NewNode(jsonValue)
+	inst := maasInstance{&obj, s.makeEnviron()}
+
+	_, err := inst.Addresses()
+	c.Assert(err, gc.NotNil)
+}
+
+func (s *instanceTest) TestAddressesInvalidContents(c *gc.C) {
+	jsonValue := `{
+		"hostname": "testing.invalid",
+		"system_id": "system_id",
+		"ip_addresses": [42]
+		}`
+	obj := s.testMAASObject.TestServer.NewNode(jsonValue)
+	inst := maasInstance{&obj, s.makeEnviron()}
+
+	_, err := inst.Addresses()
+	c.Assert(err, gc.NotNil)
+=======
+	c.Assert(err, gc.IsNil)
+	c.Check(addr, gc.DeepEquals, expected)
+}
+
+func (s *instanceTest) TestAddressesMissing(c *gc.C) {
+	// Older MAAS versions do not have ip_addresses returned, for these
+	// just the DNS name should be returned without error.
+	jsonValue := `{
+		"hostname": "testing.invalid",
+		"system_id": "system_id"
+		}`
+	obj := s.testMAASObject.TestServer.NewNode(jsonValue)
+	inst := maasInstance{&obj, s.environ}
+
+	addr, err := inst.Addresses()
+	c.Assert(err, gc.IsNil)
+	c.Check(addr, gc.DeepEquals, []instance.Address{
+		{Value: "testing.invalid", Type: instance.HostName, NetworkScope: instance.NetworkPublic},
+	})
+}
+
+func (s *instanceTest) TestAddressesInvalid(c *gc.C) {
+	jsonValue := `{
+		"hostname": "testing.invalid",
+		"system_id": "system_id",
+		"ip_addresses": "incompatible"
+		}`
+	obj := s.testMAASObject.TestServer.NewNode(jsonValue)
+	inst := maasInstance{&obj, s.environ}
+
+	_, err := inst.Addresses()
+	c.Assert(err, gc.NotNil)
+}
+
+func (s *instanceTest) TestAddressesInvalidContents(c *gc.C) {
+	jsonValue := `{
+		"hostname": "testing.invalid",
+		"system_id": "system_id",
+		"ip_addresses": [42]
+		}`
+	obj := s.testMAASObject.TestServer.NewNode(jsonValue)
+	inst := maasInstance{&obj, s.environ}
+
+	_, err := inst.Addresses()
+	c.Assert(err, gc.NotNil)
+>>>>>>> MERGE-SOURCE
 }

=== modified file 'provider/openstack/provider.go'
=== added file 'utils/file_unix.go'
--- utils/file_unix.go	1970-01-01 00:00:00 +0000
+++ utils/file_unix.go	2013-10-17 18:24:24 +0000
@@ -0,0 +1,15 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+// +build !windows
+
+package utils
+
+import (
+	"os"
+)
+
+// Replace atomically replaces the destination file or directory with the source.
+// The errors that are returned are identical to those returned by os.Rename.
+func ReplaceFile(source, destination string) error {
+	return os.Rename(source, destination)
+}

=== added file 'utils/file_windows.go'
--- utils/file_windows.go	1970-01-01 00:00:00 +0000
+++ utils/file_windows.go	2013-10-17 18:24:24 +0000
@@ -0,0 +1,35 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package utils
+
+import (
+	"os"
+	"syscall"
+)
+
+const (
+	movefile_replace_existing = 0x1
+	movefile_write_through    = 0x8
+)
+
+//sys moveFileEx(lpExistingFileName *uint16, lpNewFileName *uint16, dwFlags uint32) (err error) = MoveFileExW
+
+// ReplaceFile atomically replaces the destination file or directory with the source.
+// The errors that are returned are identical to those returned by os.Rename.
+func ReplaceFile(source, destination string) error {
+	src, err := syscall.UTF16PtrFromString(source)
+	if err != nil {
+		return &os.LinkError{"replace", source, destination, err}
+	}
+	dest, err := syscall.UTF16PtrFromString(destination)
+	if err != nil {
+		return &os.LinkError{"replace", source, destination, err}
+	}
+
+	// see http://msdn.microsoft.com/en-us/library/windows/desktop/aa365240(v=vs.85).aspx
+	if err := moveFileEx(src, dest, movefile_replace_existing|movefile_write_through); err != nil {
+		return &os.LinkError{"replace", source, destination, err}
+	}
+	return nil
+}

=== modified file 'utils/fslock/fslock.go'
--- utils/fslock/fslock.go	2013-08-02 12:37:43 +0000
+++ utils/fslock/fslock.go	2013-10-17 18:24:24 +0000
@@ -113,7 +113,7 @@
 		}
 	}
 	// Now move the temp directory to the lock directory.
-	err = os.Rename(tempDirName, lock.lockDir())
+	err = utils.ReplaceFile(tempDirName, lock.lockDir())
 	if err != nil {
 		// Any error on rename means we failed.
 		// Beaten to it, clean up temporary directory.
@@ -200,7 +200,7 @@
 	tempLockName := fmt.Sprintf(".%s.%x", lock.name, lock.nonce)
 	tempDirName := path.Join(lock.parent, tempLockName)
 	// Now move the lock directory to the temp directory to release the lock.
-	if err := os.Rename(lock.lockDir(), tempDirName); err != nil {
+	if err := utils.ReplaceFile(lock.lockDir(), tempDirName); err != nil {
 		return err
 	}
 	// And now cleanup.

=== modified file 'utils/trivial.go'
--- utils/trivial.go	2013-07-09 10:32:23 +0000
+++ utils/trivial.go	2013-10-17 18:24:24 +0000
@@ -32,7 +32,7 @@
 	if _, err = f.Write(data); err != nil {
 		return err
 	}
-	return os.Rename(prep, path)
+	return ReplaceFile(prep, path)
 }
 
 // ReadYaml unmarshals the yaml contained in the file at path into obj. See

=== added file 'utils/zfile_windows.go'
--- utils/zfile_windows.go	1970-01-01 00:00:00 +0000
+++ utils/zfile_windows.go	2013-10-17 18:24:24 +0000
@@ -0,0 +1,25 @@
+// mksyscall_windows.pl -l32 file_windows.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+package utils
+
+import "unsafe"
+import "syscall"
+
+var (
+	modkernel32 = syscall.NewLazyDLL("kernel32.dll")
+
+	procMoveFileExW = modkernel32.NewProc("MoveFileExW")
+)
+
+func moveFileEx(lpExistingFileName *uint16, lpNewFileName *uint16, dwFlags uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procMoveFileExW.Addr(), 3, uintptr(unsafe.Pointer(lpExistingFileName)), uintptr(unsafe.Pointer(lpNewFileName)), uintptr(dwFlags))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = error(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}

=== modified file 'version/version.go'
--- version/version.go	2013-10-10 11:40:54 +0000
+++ version/version.go	2013-10-17 18:24:24 +0000
@@ -22,7 +22,11 @@
 // The presence and format of this constant is very important.
 // The debian/rules build recipe uses this value for the version
 // number of the release package.
+<<<<<<< TREE
 const version = "1.17.0"
+=======
+const version = "1.16.0"
+>>>>>>> MERGE-SOURCE
 
 // Current gives the current version of the system.  If the file
 // "FORCE-VERSION" is present in the same directory as the running