0000000000000000000000000000000000000000 43266d16742cc444c81d82f49923f99546bf6702 Levi Aul 1402508203 -0700 clone: from git@github.com:bexio/cloudformation.git 43266d16742cc444c81d82f49923f99546bf6702 7ae0507874a426eccf1e5cade20bbd06e748026a Levi Aul 1402598788 -0700 commit: Merge Bastion and NAT functions, and move DockerHost to using upstart 7ae0507874a426eccf1e5cade20bbd06e748026a 016915ad73dd873159f7f9c9f386eb833f683854 Levi Aul 1402619504 -0700 commit: Externalize DockerHost logic 016915ad73dd873159f7f9c9f386eb833f683854 78a6d90b8e3275c3c8c9556a7b30ab6a1c4a9c28 Levi Aul 1402694364 -0700 commit: Point VPN DNS at the VPN's elastic IP, not at some random public IP it has already released 78a6d90b8e3275c3c8c9556a7b30ab6a1c4a9c28 664be8114f625c8fc1ae15a5aa20e8a7bd9c1b8c Levi Aul 1402694426 -0700 commit: Provision volumes using DSL rather than automagically 664be8114f625c8fc1ae15a5aa20e8a7bd9c1b8c 5fc2276bc86b4f5251bbe95bf7991538d1144822 Levi Aul 1402712641 -0700 pull: Fast-forward 5fc2276bc86b4f5251bbe95bf7991538d1144822 8f602ddf7b210259e132a3ade20eb0d3ee0022c2 Levi Aul 1402955342 -0700 commit: Add DB layer 8f602ddf7b210259e132a3ade20eb0d3ee0022c2 3c68dc78e11550ccb3f56205fe334aea1c9eecf9 Levi Aul 1402955370 -0700 commit: Use IAM role to allow NAT to reset routing on startup 3c68dc78e11550ccb3f56205fe334aea1c9eecf9 863a1d95067b4ec3727afdf2a9b224b6d625f217 Levi Aul 1402955414 -0700 commit: Ubuntu's key server is molasses; use a mirror 863a1d95067b4ec3727afdf2a9b224b6d625f217 e77831316929f50cb4c8d55ce27706aebd4618c1 Levi Aul 1402955439 -0700 commit: Ubuntu's security updates are available on the EC2 mirror just like everything else e77831316929f50cb4c8d55ce27706aebd4618c1 f27003f717d7c0921e72830a55673384eb438f9f Levi Aul 1402955462 -0700 commit: Clean apt indexes before updating to prevent long Reading Package Lists messages f27003f717d7c0921e72830a55673384eb438f9f 337bbb08c977b573b5ab383d61cd611377ba4422 Levi Aul 1403019501 -0700 pull: Fast-forward 337bbb08c977b573b5ab383d61cd611377ba4422 da9d586001c0da57a72d958fe9e454bc4c1af15a Levi Aul 1403019550 -0700 pull: Fast-forward da9d586001c0da57a72d958fe9e454bc4c1af15a cf998cd89b73281c9176981ac57e49d59329a5a1 Levi Aul 1403039739 -0700 pull: Fast-forward cf998cd89b73281c9176981ac57e49d59329a5a1 15810e99050544479c8b2b90c768562dd6f54476 Levi Aul 1403145111 -0700 pull: Fast-forward 15810e99050544479c8b2b90c768562dd6f54476 b7ba33e063b2ad40ca7f053d4a0145a8e5a39abc Levi Aul 1403148321 -0700 commit: Allow NAT to reset PrivateRouteThroughBastionBox when it comes up b7ba33e063b2ad40ca7f053d4a0145a8e5a39abc d90d1e2156e12c2cc4be35edd2b469f4c891eba2 Levi Aul 1403148789 -0700 pull: Fast-forward d90d1e2156e12c2cc4be35edd2b469f4c891eba2 51db6ab779ca5bc4b13ba68ebdfaab521c010948 Levi Aul 1403148835 -0700 commit (amend): Increase timeouts for instance start 51db6ab779ca5bc4b13ba68ebdfaab521c010948 9c098fb3f0caace7f5aea2944e9f605191c8cbba Levi Aul 1403320413 -0700 pull: Fast-forward 9c098fb3f0caace7f5aea2944e9f605191c8cbba 1bec724d878695a0d27bbddcf8c21c4cc7e1f073 Levi Aul 1403393081 -0700 commit: Better Rakefile tasks 1bec724d878695a0d27bbddcf8c21c4cc7e1f073 e2f37b8916b66675f153906ebda58fafcf12e8ff Levi Aul 1403393115 -0700 commit: VPC DHCP DomainName should only ever be something.compute.internal e2f37b8916b66675f153906ebda58fafcf12e8ff 7947526f0f3bc0e41576835c158e21d10b5e970a Levi Aul 1403393282 -0700 commit: Squash logs by layer+resource 7947526f0f3bc0e41576835c158e21d10b5e970a 2ca445a3e7d3f04ec0a985860f9f1738d2f37fdd Levi Aul 1403395219 -0700 commit: Ensure main-net bitcoin wallets trigger the use of main-net bitcoind 2ca445a3e7d3f04ec0a985860f9f1738d2f37fdd b02c21c5b3c67f079eab9852d0718e6151fb1f16 Levi Aul 1403395320 -0700 commit: Pin major versions of dependencies b02c21c5b3c67f079eab9852d0718e6151fb1f16 a81f6de78708917a2439ae7b9426e9a4417d4520 Levi Aul 1403397264 -0700 commit: Gist unneeded when docker-utils is installed a81f6de78708917a2439ae7b9426e9a4417d4520 05aa1b23a9a9c8338064b367056458a3e6359872 Levi Aul 1403401048 -0700 commit: Remove run-gist logic (unneeded given docker-utils gem) 05aa1b23a9a9c8338064b367056458a3e6359872 79b78df8abb2703e35a607c5b083bfaf1ebe1545 Levi Aul 1403403908 -0700 commit: Use docker-utils in role scripts 79b78df8abb2703e35a607c5b083bfaf1ebe1545 67b85e93755c44eec83e32ec5825b034de27a80f Levi Aul 1403404549 -0700 commit (amend): Use docker-utils in role scripts 67b85e93755c44eec83e32ec5825b034de27a80f 36b6662ae57207c098d8cd5ece18d989d07c1fab Levi Aul 1403407242 -0700 commit: Make enabled coin-network listeners configurable 36b6662ae57207c098d8cd5ece18d989d07c1fab e3e76642af467f13ca1f4bb186d06f7f4840e191 Levi Aul 1403469127 -0700 commit: Report status by layer e3e76642af467f13ca1f4bb186d06f7f4840e191 d291a13692ce5a5b2f47b2a66e69e6c068a5650f Levi Aul 1403471103 -0700 commit (amend): Report status by layer d291a13692ce5a5b2f47b2a66e69e6c068a5650f ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 Levi Aul 1403474886 -0700 commit: Hide task layers in status ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 401ec5566a108682e6735a166b503f6488fd7fa0 Levi Aul 1403548854 -0700 commit: Disable privacy of private subnet as temporary workaround to expedite blockchain downloads 401ec5566a108682e6735a166b503f6488fd7fa0 ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 Levi Aul 1403550568 -0700 checkout: moving from master to ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 401ec5566a108682e6735a166b503f6488fd7fa0 Levi Aul 1403550593 -0700 checkout: moving from ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 to master 401ec5566a108682e6735a166b503f6488fd7fa0 401ec5566a108682e6735a166b503f6488fd7fa0 Levi Aul 1403550599 -0700 checkout: moving from master to nonat 401ec5566a108682e6735a166b503f6488fd7fa0 ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 Levi Aul 1403550605 -0700 checkout: moving from nonat to ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 401ec5566a108682e6735a166b503f6488fd7fa0 Levi Aul 1403550614 -0700 checkout: moving from ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 to master 401ec5566a108682e6735a166b503f6488fd7fa0 ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 Levi Aul 1403550619 -0700 reset: moving to ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 401ec5566a108682e6735a166b503f6488fd7fa0 Levi Aul 1403550625 -0700 checkout: moving from master to nonat 401ec5566a108682e6735a166b503f6488fd7fa0 ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 Levi Aul 1403550636 -0700 checkout: moving from nonat to master ee8ddf6fe1cf9e69129765756ea09cdb50007fa2 36fce3986c3b9edc2d23aa2c79b07caa538a1e2d Levi Aul 1403568916 -0700 commit: Enlarge BastionBox to increase its network throughput 36fce3986c3b9edc2d23aa2c79b07caa538a1e2d 2e594432083753c4b260203a3de83376c1f31419 Levi Aul 1403578223 -0700 commit: Ignore stacks for which the initiating user does not have access 2e594432083753c4b260203a3de83376c1f31419 e025280ec493575d2176fa61c6a90d3262566227 Levi Aul 1403578247 -0700 commit: Warm the blockchain before starting bitcoind for real e025280ec493575d2176fa61c6a90d3262566227 ac1c6a234743dcb02025497b631d3650ccb25bcc Levi Aul 1403580402 -0700 commit: Proper dependencies for wait handles ac1c6a234743dcb02025497b631d3650ccb25bcc 8e2dc5d0cbddc0b5854a722cbfdd53e29f5429ff Levi Aul 1403580470 -0700 commit: Warm bitcoind using relevant blockchain 8e2dc5d0cbddc0b5854a722cbfdd53e29f5429ff 99dd8d19357e71e3677fe25ec870b70d6056b250 Levi Aul 1403648167 -0700 commit: Allow backend to read from blockchain buckets 99dd8d19357e71e3677fe25ec870b70d6056b250 fe4b3a53f8fc4f3bf66080f3432c2258d89d5db0 Levi Aul 1403648208 -0700 commit: Expose IdentityMind configuration to stacco fe4b3a53f8fc4f3bf66080f3432c2258d89d5db0 6eed1d8bd6ca0f3d5407ff10ea858e97c9275b88 Levi Aul 1403658649 -0700 commit: Use an extremely long timeout on Backend instances to allow them time to pull the blockchain from S3 6eed1d8bd6ca0f3d5407ff10ea858e97c9275b88 161674f5c76626e5bbffc7e71c20211d96899429 Levi Aul 1403658670 -0700 commit: Update to new Ubuntu ebs-ssd AMI 161674f5c76626e5bbffc7e71c20211d96899429 07506ae5d4f20db18bc4df1c96b9433162effa0b Levi Aul 1403658704 -0700 commit: AWS-provided NAT AMI IDs are irrelevant, NAT logic is in BastionBox 07506ae5d4f20db18bc4df1c96b9433162effa0b 37963467810545c413ee63c07b03ef5451cd21a4 Levi Aul 1403722584 -0700 commit: Decompress blocks stored compressed 37963467810545c413ee63c07b03ef5451cd21a4 cfbccd7b6c433bdedb589e83144a05cca3a50e86 Levi Aul 1403725114 -0700 commit: Reset TCP window scaling while trying to download from S3 to prevent Connection Reset by Peer errors cfbccd7b6c433bdedb589e83144a05cca3a50e86 ef3411b02bb0f32b7d420f19e5bd1fbbcca55914 Levi Aul 1403727838 -0700 commit: Use SSD storage for docker-image and data-container volumes ef3411b02bb0f32b7d420f19e5bd1fbbcca55914 bfdf2e1ff6a2624f4a8e8c7bb67a35c233680182 Levi Aul 1403735112 -0700 revert: Revert "Reset TCP window scaling while trying to download from S3 to prevent Connection Reset by Peer errors" bfdf2e1ff6a2624f4a8e8c7bb67a35c233680182 3a3d3096b8a071125990a515d1ba8a4c548bec62 Levi Aul 1403735187 -0700 commit: Retry after errors in S3 download 3a3d3096b8a071125990a515d1ba8a4c548bec62 ee046d6cded6dead3f5f28cdd033b81824935d97 Levi Aul 1403739236 -0700 commit: Increase health-check grace period for backend ee046d6cded6dead3f5f28cdd033b81824935d97 a8daedf0736425657be336e720dd7520abe75f3d Levi Aul 1403833608 -0700 commit: Increase health-check interval so stack won't be brought down by container updates a8daedf0736425657be336e720dd7520abe75f3d 89a9c546a2bc92ff3842edf6b5da4ee4b9bd2291 Levi Aul 1403839775 -0700 commit: Ensure task layers can be enabled or disabled by specifying "all" 89a9c546a2bc92ff3842edf6b5da4ee4b9bd2291 555abaf0d0b29f123811187b275b2c147a128cc1 Levi Aul 1403840277 -0700 commit (amend): Ensure task layers can be enabled or disabled by specifying "all" 555abaf0d0b29f123811187b275b2c147a128cc1 8606dd5bf12eacc932a95d244d7b150dd3a1ec65 Levi Aul 1403898548 -0700 commit: Parameterize stack name 8606dd5bf12eacc932a95d244d7b150dd3a1ec65 8606dd5bf12eacc932a95d244d7b150dd3a1ec65 Levi Aul 1404171665 -0700 checkout: moving from master to use-ami 8606dd5bf12eacc932a95d244d7b150dd3a1ec65 a22431d00b3163b528af17ace0bc97d1512b5786 Levi Aul 1404171720 -0700 commit: Generate an AMI in a task, and use it in instances a22431d00b3163b528af17ace0bc97d1512b5786 8606dd5bf12eacc932a95d244d7b150dd3a1ec65 Levi Aul 1404171749 -0700 checkout: moving from use-ami to master 8606dd5bf12eacc932a95d244d7b150dd3a1ec65 401ec5566a108682e6735a166b503f6488fd7fa0 Levi Aul 1404243741 -0700 checkout: moving from master to nonat 401ec5566a108682e6735a166b503f6488fd7fa0 a22431d00b3163b528af17ace0bc97d1512b5786 Levi Aul 1404243744 -0700 checkout: moving from nonat to use-ami a22431d00b3163b528af17ace0bc97d1512b5786 a691c826ef7d39142e3c2c38caa57ac976b51ce6 Levi Aul 1404243822 -0700 commit: Add BaseImageGenerator role-script a691c826ef7d39142e3c2c38caa57ac976b51ce6 a691c826ef7d39142e3c2c38caa57ac976b51ce6 Levi Aul 1404244099 -0700 rebase: checkout use-ami a691c826ef7d39142e3c2c38caa57ac976b51ce6 820f726ca5bab149eb210a8ba146091fee24c738 Levi Aul 1404251113 -0700 commit: Don't select a hostname for bootstrap task instance 820f726ca5bab149eb210a8ba146091fee24c738 ecdb4c8cd1c16ecaaff88132e743f6565c262b51 Levi Aul 1404251144 -0700 commit: Allow kernel updates during bootstrapping ecdb4c8cd1c16ecaaff88132e743f6565c262b51 58c15481406ff1e499d4bbb1c21307febcffddac Levi Aul 1404251172 -0700 commit: Reboot using kexec, and add default options to apt-get 58c15481406ff1e499d4bbb1c21307febcffddac 873e0922c1acb90101e87d326a0169ebaabdd33c Levi Aul 1404251192 -0700 commit: Don't start logentries-daemon during bootstrapping 873e0922c1acb90101e87d326a0169ebaabdd33c 631963958c536aefc53d6f7bd223437dfc8e38cd Levi Aul 1404251205 -0700 commit: Don't run cfn-init during bootstrapping 631963958c536aefc53d6f7bd223437dfc8e38cd 647fc20f107fb01a9794eba14b09d1cf3121e7bc Levi Aul 1404251253 -0700 commit: cfn-bootstrap-tools will always be already installed when running Common role-script 647fc20f107fb01a9794eba14b09d1cf3121e7bc c9d38570d3faf0a63a5fed4704e2a5c8f2dab339 Levi Aul 1404251315 -0700 commit: LogEntries will already be installed, but must be bootstrapped (registered with the service, and set up with logs to follow) c9d38570d3faf0a63a5fed4704e2a5c8f2dab339 4bc0c4eccdfc87ba9d1e4ca2f33aa72fcac9abee Levi Aul 1404251341 -0700 commit: Remove rerouting code for bastion instance -- it doesn't work anyway 4bc0c4eccdfc87ba9d1e4ca2f33aa72fcac9abee e13f9d993e291a95855a572f8930725c35fec46b Levi Aul 1404340122 -0700 commit: Make bastion rely on baked AMI e13f9d993e291a95855a572f8930725c35fec46b 743a8939b2404dd251c92ea7952bc12274909895 Levi Aul 1404340157 -0700 commit: Bootstrapping is required to pull containers 743a8939b2404dd251c92ea7952bc12274909895 8606dd5bf12eacc932a95d244d7b150dd3a1ec65 Levi Aul 1404340200 -0700 checkout: moving from use-ami to master 8606dd5bf12eacc932a95d244d7b150dd3a1ec65 4b1e135e9977fb3912f4ac4ed37cc6cffcd36499 Levi Aul 1404340763 -0700 commit: Add a parameter group to db layer 4b1e135e9977fb3912f4ac4ed37cc6cffcd36499 743a8939b2404dd251c92ea7952bc12274909895 Levi Aul 1404340776 -0700 checkout: moving from master to use-ami 743a8939b2404dd251c92ea7952bc12274909895 4b1e135e9977fb3912f4ac4ed37cc6cffcd36499 Levi Aul 1404340779 -0700 rebase: checkout master 4b1e135e9977fb3912f4ac4ed37cc6cffcd36499 57290bb57831f06c2bcbcd595e41b697cb9fdda0 Levi Aul 1404340779 -0700 rebase: Generate an AMI in a task, and use it in instances 57290bb57831f06c2bcbcd595e41b697cb9fdda0 48e861479df37de34b7048c9b6782dbe3859194d Levi Aul 1404340780 -0700 rebase: Add BaseImageGenerator role-script 48e861479df37de34b7048c9b6782dbe3859194d 05f886db46171205b6825bab13d09d4a84eac924 Levi Aul 1404340780 -0700 rebase: Don't select a hostname for bootstrap task instance 05f886db46171205b6825bab13d09d4a84eac924 43c66ae8d731b2fb22181dc26e2566b9913f6884 Levi Aul 1404340780 -0700 rebase: Allow kernel updates during bootstrapping 43c66ae8d731b2fb22181dc26e2566b9913f6884 c8a01e4143bd5b2be18f010b798b7dd3b8f9105f Levi Aul 1404340780 -0700 rebase: Reboot using kexec, and add default options to apt-get c8a01e4143bd5b2be18f010b798b7dd3b8f9105f df102328122c4d77469f75c6cc283b00108bd1ed Levi Aul 1404340780 -0700 rebase: Don't start logentries-daemon during bootstrapping df102328122c4d77469f75c6cc283b00108bd1ed 41ddc7cf35ba287bb797e05f87c10b2c9d95c32c Levi Aul 1404340780 -0700 rebase: Don't run cfn-init during bootstrapping 41ddc7cf35ba287bb797e05f87c10b2c9d95c32c 92466bae88d3b67a2a7a40b5f0b839d599521799 Levi Aul 1404340780 -0700 rebase: cfn-bootstrap-tools will always be already installed when running Common role-script 92466bae88d3b67a2a7a40b5f0b839d599521799 122816e32e10d9a156a6db6a7a031c7599eb2f2d Levi Aul 1404340780 -0700 rebase: LogEntries will already be installed, but must be bootstrapped (registered with the service, and set up with logs to follow) 122816e32e10d9a156a6db6a7a031c7599eb2f2d 3347bb8c06785d895bd61178a1767f5fa007a815 Levi Aul 1404340780 -0700 rebase: Remove rerouting code for bastion instance -- it doesn't work anyway 3347bb8c06785d895bd61178a1767f5fa007a815 b43fb1b0df411dc9894caaae8cb2273703182dcb Levi Aul 1404340780 -0700 rebase: Make bastion rely on baked AMI b43fb1b0df411dc9894caaae8cb2273703182dcb 0c0429d424005185b0980358585b1d17db9fd744 Levi Aul 1404340780 -0700 rebase: Bootstrapping is required to pull containers 0c0429d424005185b0980358585b1d17db9fd744 0c0429d424005185b0980358585b1d17db9fd744 Levi Aul 1404340780 -0700 rebase finished: returning to refs/heads/use-ami 0c0429d424005185b0980358585b1d17db9fd744 743a8939b2404dd251c92ea7952bc12274909895 Levi Aul 1404342010 -0700 pull --rebase: checkout 743a8939b2404dd251c92ea7952bc12274909895 743a8939b2404dd251c92ea7952bc12274909895 5f24b3bc498af8cad5fc6e716000c075508dd943 Levi Aul 1404342010 -0700 pull --rebase: Add a parameter group to db layer 5f24b3bc498af8cad5fc6e716000c075508dd943 5f24b3bc498af8cad5fc6e716000c075508dd943 Levi Aul 1404342010 -0700 rebase finished: returning to refs/heads/use-ami 5f24b3bc498af8cad5fc6e716000c075508dd943 4b1e135e9977fb3912f4ac4ed37cc6cffcd36499 Levi Aul 1404342012 -0700 rebase: checkout master 4b1e135e9977fb3912f4ac4ed37cc6cffcd36499 55f2a4f9a642b2c9f19da6fcbfad18a22f4b11db Levi Aul 1404342012 -0700 rebase: Generate an AMI in a task, and use it in instances 55f2a4f9a642b2c9f19da6fcbfad18a22f4b11db a74368a861be3c0712ad60379ca6cccd2647cbd6 Levi Aul 1404342012 -0700 rebase: Add BaseImageGenerator role-script a74368a861be3c0712ad60379ca6cccd2647cbd6 4dd0ffb78ac5a5e9c4a5983db4567330a8716c53 Levi Aul 1404342012 -0700 rebase: Don't select a hostname for bootstrap task instance 4dd0ffb78ac5a5e9c4a5983db4567330a8716c53 e4295d94f0d49a61cb1f4d194583f8cd5b25b6d7 Levi Aul 1404342013 -0700 rebase: Allow kernel updates during bootstrapping e4295d94f0d49a61cb1f4d194583f8cd5b25b6d7 513245a8ed94a313de9c9be99d0436cafa5f4542 Levi Aul 1404342013 -0700 rebase: Reboot using kexec, and add default options to apt-get 513245a8ed94a313de9c9be99d0436cafa5f4542 f97d39f4963d8bceef8ca667a6a31ac619d131c6 Levi Aul 1404342013 -0700 rebase: Don't start logentries-daemon during bootstrapping f97d39f4963d8bceef8ca667a6a31ac619d131c6 86a06a4d1338d52898428e1c9319d9c5e8aa59fa Levi Aul 1404342013 -0700 rebase: Don't run cfn-init during bootstrapping 86a06a4d1338d52898428e1c9319d9c5e8aa59fa 60dbcc289e60f8b3da1e991363c2cbb8a7c99c6d Levi Aul 1404342013 -0700 rebase: cfn-bootstrap-tools will always be already installed when running Common role-script 60dbcc289e60f8b3da1e991363c2cbb8a7c99c6d 8a3812be98a369fe0e8cccc55a62f07d17a91564 Levi Aul 1404342013 -0700 rebase: LogEntries will already be installed, but must be bootstrapped (registered with the service, and set up with logs to follow) 8a3812be98a369fe0e8cccc55a62f07d17a91564 51307ca8e26fbc0e4739fd92d601ee23e7bef1bc Levi Aul 1404342013 -0700 rebase: Remove rerouting code for bastion instance -- it doesn't work anyway 51307ca8e26fbc0e4739fd92d601ee23e7bef1bc e0bb46327d0309abfc4270f1a08236ac553f6904 Levi Aul 1404342013 -0700 rebase: Make bastion rely on baked AMI e0bb46327d0309abfc4270f1a08236ac553f6904 5113f1339b8e19c5ae354a0ab1d76108de880e20 Levi Aul 1404342013 -0700 rebase: Bootstrapping is required to pull containers 5113f1339b8e19c5ae354a0ab1d76108de880e20 5113f1339b8e19c5ae354a0ab1d76108de880e20 Levi Aul 1404342013 -0700 rebase finished: returning to refs/heads/use-ami 5113f1339b8e19c5ae354a0ab1d76108de880e20 4b1e135e9977fb3912f4ac4ed37cc6cffcd36499 Levi Aul 1404342051 -0700 checkout: moving from use-ami to master 4b1e135e9977fb3912f4ac4ed37cc6cffcd36499 5113f1339b8e19c5ae354a0ab1d76108de880e20 Levi Aul 1404342053 -0700 merge use-ami: Fast-forward