Merge branch 'queueworker' of https://github.com/pkandasamy91/aws-cdk …

…into queueworker
aws · May 20, 2019 · 5662fb1 · 5662fb1
2 parents 5ad2cde + 5e6c82b
commit 5662fb1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/packages/@aws-cdk/aws-ecs/lib/queue-worker-service-base.ts b/packages/@aws-cdk/aws-ecs/lib/queue-worker-service-base.ts
@@ -46,7 +46,11 @@ export interface QueueWorkerServiceBaseProps {
   /**
    * The environment variables to pass to the container.
    *
+<<<<<<< HEAD
    * @default 'QUEUE_NAME: queue.queueName'
+=======
+   * @default none
+>>>>>>> 5e6c82bfe554e79ec3fa494c7998c00402cf3aa1
    */
   readonly environment?: { [key: string]: string };