Merge prop fixes and a few missed things

builddeb.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2011 OpenStack, LLC
+# Copyright 2010 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

doc/source/conf.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2011 OpenStack, LLC.
+# Copyright (c) 2010 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import sys
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.append([os.path.abspath('../glance'),
     os.path.abspath('..'),
-    os.path.abspath('../bin'),
+    os.path.abspath('../bin')
     ])
 
 # -- General configuration ---------------------------------------------------
@@ -126,7 +126,7 @@ man_pages = [
     ('man/glanceapi', 'glance-api', u'Glance API Server',
      [u'OpenStack'], 1),
     ('man/glanceregistry', 'glance-registry', u'Glance Registry Server',
-     [u'OpenStack'], 1),
+     [u'OpenStack'], 1)
  ]
 
 

glance/registry/__init__.py

@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2011 OpenStack LLC.
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

glance/registry/client.py

@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010-2011 OpenStack, LLC
+# Copyright 2010 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

tools/pip-requires

@@ -7,7 +7,6 @@ eventlet>=0.9.12
 lockfile==0.8
 python-daemon==1.5.5
 python-gflags>=1.3
-bzr
 routes
 webob
 wsgiref