From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Tue, 12 Jan 2016 08:48:24 +0000 (+0100)
Subject: merge.
X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=2bc3ec9f9e569ce49f86918a49d1dada71bc0500;p=emacsconfig.git

merge.
---

diff --git a/snippets/eshell-mode/aws-ec2-get-instances b/snippets/eshell-mode/aws-ec2-get-instances
index cd813f81..a14aa123 100644
--- a/snippets/eshell-mode/aws-ec2-get-instances
+++ b/snippets/eshell-mode/aws-ec2-get-instances
@@ -2,4 +2,4 @@
 # name: aws-ec2-get-instances
 # key: aws-ec2-get-instances
 # --
-aws --profile=${1:$$(yas-choose-value '("prod" "test"))} ${2:--region=${3:$$(yas-choose-value "\$\{REGION\}" bba-aws-regions)}} ec2 describe-instances --query 'Reservations[].Instances[].[join(\`,\`,Tags[?Key==\`Name\`].Value),join(\`,\`,Tags[?Key==\`Schedule\`].Value),InstanceId, State.Name, PublicDnsName, InstanceType,Placement.AvailabilityZone]' --output ${4:$$(yas-choose-value '("text" "table" "json"))} $0
\ No newline at end of file
+aws --profile=${1:$$(yas-choose-value '("prod" "test"))} ${2:--region=${3:$$(yas-choose-value "\$\{REGION\}" bba-aws-regions)}} ec2 describe-instances --query 'Reservations[].Instances[].[join(\`,\`,Tags[?Key==\`Name\`].Value),join(\`,\`,Tags[?Key==\`Schedule\`].Value),InstanceId, State.Name, PublicDnsName, InstanceType,Placement.AvailabilityZone]' --output ${4:$$(yas-choose-value '("text" "table" "json"))} $0