From 8015360eaf45a092322cc09220a7349320a06ab1 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Mon, 12 Jan 2015 22:47:36 +0000
Subject: [PATCH 1/2] update copyrights to 2015

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: e5869b2b0bdf85d15813c714565fd49943c3d754
Component: engine
---
 components/engine/docs/mkdocs.yml               | 2 +-
 components/engine/docs/theme/mkdocs/footer.html | 4 ++--
 components/engine/pkg/mflag/LICENSE             | 2 +-
 components/engine/pkg/mflag/flag.go             | 2 +-
 components/engine/pkg/mflag/flag_test.go        | 4 ++--
 components/engine/pkg/symlink/LICENSE.APACHE    | 2 +-
 components/engine/pkg/symlink/LICENSE.BSD       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/engine/docs/mkdocs.yml b/components/engine/docs/mkdocs.yml
index 6d2ecac3a4..73150cc443 100644
--- a/components/engine/docs/mkdocs.yml
+++ b/components/engine/docs/mkdocs.yml
@@ -18,7 +18,7 @@ use_absolute_urls: true
 theme_dir: ./theme/mkdocs/
 theme_center_lead: false
 
-copyright: Copyright &copy; 2014, Docker, Inc.
+copyright: Copyright &copy; 2014-2015, Docker, Inc.
 google_analytics: ['UA-6096819-11', 'docker.io']
 
 pages:
diff --git a/components/engine/docs/theme/mkdocs/footer.html b/components/engine/docs/theme/mkdocs/footer.html
index 69a4e6367f..923ace519c 100644
--- a/components/engine/docs/theme/mkdocs/footer.html
+++ b/components/engine/docs/theme/mkdocs/footer.html
@@ -101,7 +101,7 @@
     </div>
     <div class="row clearfix">
       <div class="span6 pagination-right copyright">
-        <span>&copy; 2014 Docker, Inc.</span>
+        <span>&copy; 2014-2015 Docker, Inc.</span>
       </div>
       <div class="span6 pagination-left copyright">
         <a href="http://www.docker.com/legal/terms_of_service">Terms</a> &middot;
@@ -110,4 +110,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/components/engine/pkg/mflag/LICENSE b/components/engine/pkg/mflag/LICENSE
index ebcfbcc779..ac74d8f049 100644
--- a/components/engine/pkg/mflag/LICENSE
+++ b/components/engine/pkg/mflag/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014 The Docker & Go Authors. All rights reserved.
+Copyright (c) 2014-2015 The Docker & Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/engine/pkg/mflag/flag.go b/components/engine/pkg/mflag/flag.go
index 72addae63c..1707b16faa 100644
--- a/components/engine/pkg/mflag/flag.go
+++ b/components/engine/pkg/mflag/flag.go
@@ -1,4 +1,4 @@
-// Copyright 2014 The Docker & Go Authors. All rights reserved.
+// Copyright 2014-2015 The Docker & Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
diff --git a/components/engine/pkg/mflag/flag_test.go b/components/engine/pkg/mflag/flag_test.go
index b8c0b305d4..df640d1485 100644
--- a/components/engine/pkg/mflag/flag_test.go
+++ b/components/engine/pkg/mflag/flag_test.go
@@ -1,4 +1,4 @@
-// Copyright 2014 The Docker & Go Authors. All rights reserved.
+// Copyright 2014-2015 The Docker & Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -7,12 +7,12 @@ package mflag_test
 import (
 	"bytes"
 	"fmt"
-	. "github.com/docker/docker/pkg/mflag"
 	"os"
 	"sort"
 	"strings"
 	"testing"
 	"time"
+	. "github.com/docker/docker/pkg/mflag"
 )
 
 // ResetForTesting clears all flag state and sets the usage function as directed.
diff --git a/components/engine/pkg/symlink/LICENSE.APACHE b/components/engine/pkg/symlink/LICENSE.APACHE
index 27448585ad..9e4bd4dbee 100644
--- a/components/engine/pkg/symlink/LICENSE.APACHE
+++ b/components/engine/pkg/symlink/LICENSE.APACHE
@@ -176,7 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2014 Docker, Inc.
+   Copyright 2014-2015 Docker, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/components/engine/pkg/symlink/LICENSE.BSD b/components/engine/pkg/symlink/LICENSE.BSD
index ebcfbcc779..ac74d8f049 100644
--- a/components/engine/pkg/symlink/LICENSE.BSD
+++ b/components/engine/pkg/symlink/LICENSE.BSD
@@ -1,4 +1,4 @@
-Copyright (c) 2014 The Docker & Go Authors. All rights reserved.
+Copyright (c) 2014-2015 The Docker & Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are

From 502d87f39d569ecd7be57909ce725a7246ae8645 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Mon, 12 Jan 2015 22:52:19 +0000
Subject: [PATCH 2/2] fix issue with goimport

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: b70632ec532d4a948e227a646f8286d7c439cb4f
Component: engine
---
 components/engine/pkg/mflag/flag_test.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/engine/pkg/mflag/flag_test.go b/components/engine/pkg/mflag/flag_test.go
index df640d1485..85f32c8aa4 100644
--- a/components/engine/pkg/mflag/flag_test.go
+++ b/components/engine/pkg/mflag/flag_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package mflag_test
+package mflag
 
 import (
 	"bytes"
@@ -12,7 +12,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-	. "github.com/docker/docker/pkg/mflag"
 )
 
 // ResetForTesting clears all flag state and sets the usage function as directed.