From 1533b68665bac4bfa9493030aabcf1db2c1ba8f9 Mon Sep 17 00:00:00 2001
From: Lisa Clark <lisa.clark@rackspace.com>
Date: Thu, 6 Aug 2015 12:58:27 -0400
Subject: [PATCH] Removing Cloudkeep from comments

Cleaning up comments and removing Rackspace specific verbiage.

Change-Id: I36675fcc84908043f6c2182de2232fe0bdd15e33
---
 barbican/__init__.py       | 2 +-
 barbican/api/__init__.py   | 2 +-
 barbican/api/app.py        | 2 +-
 barbican/model/__init__.py | 2 +-
 barbican/model/models.py   | 8 +++-----
 barbican/queue/__init__.py | 2 +-
 barbican/tasks/__init__.py | 2 +-
 bin/barbican-all           | 2 +-
 bin/barbican-worker        | 2 +-
 9 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/barbican/__init__.py b/barbican/__init__.py
index 3e2ee2194..f614b77a7 100644
--- a/barbican/__init__.py
+++ b/barbican/__init__.py
@@ -14,5 +14,5 @@
 #    under the License.
 
 """
-Cloudkeep's Barbican module root
+Barbican module root
 """
diff --git a/barbican/api/__init__.py b/barbican/api/__init__.py
index ce14887e6..34aefbd1b 100644
--- a/barbican/api/__init__.py
+++ b/barbican/api/__init__.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """
-API handler for Cloudkeep's Barbican
+API handler for Barbican
 """
 import pkgutil
 
diff --git a/barbican/api/app.py b/barbican/api/app.py
index f15214a82..d8638d527 100644
--- a/barbican/api/app.py
+++ b/barbican/api/app.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """
-API application handler for Cloudkeep's Barbican
+API application handler for Barbican
 """
 import pecan
 
diff --git a/barbican/model/__init__.py b/barbican/model/__init__.py
index 4cdc0c412..945f520b5 100644
--- a/barbican/model/__init__.py
+++ b/barbican/model/__init__.py
@@ -14,5 +14,5 @@
 # limitations under the License.
 
 """
-Model objects for Cloudkeep's Barbican
+Model objects for Barbican
 """
diff --git a/barbican/model/models.py b/barbican/model/models.py
index 691aae97e..c12c8f05e 100644
--- a/barbican/model/models.py
+++ b/barbican/model/models.py
@@ -240,8 +240,7 @@ class ContainerSecret(BASE, SoftDeleteMixIn, ModelBase):
 class Project(BASE, SoftDeleteMixIn, ModelBase):
     """Represents a Project in the datastore.
 
-    Projects are users that wish to store secret information within
-    Cloudkeep's Barbican.
+    Projects are users that wish to store secret information within Barbican.
     """
 
     __tablename__ = 'projects'
@@ -263,9 +262,8 @@ class Secret(BASE, SoftDeleteMixIn, ModelBase):
     """Represents a Secret in the datastore.
 
     Secrets are any information Projects wish to store within
-    Cloudkeep's Barbican, though the actual encrypted data
-    is stored in one or more EncryptedData entities on behalf
-    of a Secret.
+    Barbican, though the actual encrypted data is stored in one
+    or more EncryptedData entities on behalf of a Secret.
     """
 
     __tablename__ = 'secrets'
diff --git a/barbican/queue/__init__.py b/barbican/queue/__init__.py
index 58d639e48..2c81dbff9 100644
--- a/barbican/queue/__init__.py
+++ b/barbican/queue/__init__.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """
-Queue objects for Cloudkeep's Barbican
+Queue objects for Barbican
 """
 import oslo_messaging as messaging
 from oslo_messaging.notify import dispatcher as notfiy_dispatcher
diff --git a/barbican/tasks/__init__.py b/barbican/tasks/__init__.py
index a0f6cacbb..af6ebf994 100644
--- a/barbican/tasks/__init__.py
+++ b/barbican/tasks/__init__.py
@@ -14,5 +14,5 @@
 # limitations under the License.
 
 """
-Task processing objects for Cloudkeep's Barbican
+Task processing objects for Barbican
 """
diff --git a/bin/barbican-all b/bin/barbican-all
index 7a7490832..eb2e9ee21 100755
--- a/bin/barbican-all
+++ b/bin/barbican-all
@@ -4,7 +4,7 @@
 # WARNING: This script is deprecated now. Please use the barbican.sh script instead.
 #####
 
-# barbican-api - Script run Cloudkeep's Barbican API app.
+# barbican-api - Script run Barbican API app.
 
 PKG=barbican
 
diff --git a/bin/barbican-worker b/bin/barbican-worker
index 4050ffa7d..df6b5d8ee 100755
--- a/bin/barbican-worker
+++ b/bin/barbican-worker
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-# barbican-worker - Script run Cloudkeep's Barbican worker app.
+# barbican-worker - Script run Barbican worker app.
 
 python bin/barbican-worker.py