removed last issue 496 items - PR is only for issue 495 now

cloudtools · Nov 9, 2017 · cda591b · cda591b
1 parent f71fc6e
commit cda591b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/docs/config.rst b/docs/config.rst
@@ -113,9 +113,8 @@ that stacker applies), specify an empty map for the top-level keyword::
 
  bucket_tags: {}
 
-Tags updates get applied on every stacker run
+S3 Bucket Tags updates get applied on every stacker run
 
-.. _`AWS CloudFormation Resource Tags Type`: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html
 
 Module Paths
 ------------
@@ -274,8 +273,7 @@ If no tags are specified, the `stacker_namespace` tag is applied to your stack
 with the value of `namespace` as the tag value.
 
 If you prefer to apply a custom set of tags, specify the top-level keyword
-`tags` as a map. The `stacker_namespace` tag will be automaticly added as well
-to help identify resources created by Stacker. Example::
+`tags` as a map. Example::
 
  tags:
  "hello": world

diff --git a/stacker/context.py b/stacker/context.py
@@ -97,9 +97,6 @@ def upload_templates_to_s3(self):
  def tags(self):
  tags = self.config.tags
  if tags is not None:
- if "stacker_namespace" in tags:
- return tags
- tags["stacker_namespace"] = self.namespace
  return tags
  if self.namespace:
  return {"stacker_namespace": self.namespace}