Produced by Araxis Merge on 10/2/2017 1:40:11 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | chef-repo.zip\chef-repo\third_party_cookbooks\packagecloud | 0001-chef-on-amazon-2014.patch | Wed Jun 3 20:37:07 2015 UTC |
| 2 | chef-repo.zip\chef-repo\third_party_cookbooks\packagecloud | 0001-chef-on-amazon-2014.patch | Mon Oct 2 15:42:27 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 128 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | From e705e 0beb6cd934 47dec04aea 8bdda004fb b8ab7 Mon Sep 17 00: 00:00 2001 | |
| 2 | From: capo tej <jcapo te@gmail.c om> | |
| 3 | Date: Tue, 28 Oct 20 14 12:47:1 7 -0700 | |
| 4 | Subject: [ PATCH] che f on amazo n 2014 | |
| 5 | ||
| 6 | --- | |
| 7 | .kitchen. yml | 23 + ++++++++++ +++++++++- -- | |
| 8 | Gemfile | 1 + | |
| 9 | 2 files c hanged, 21 insertion s(+), 3 de letions(-) | |
| 10 | ||
| 11 | diff --git a/.kitche n.yml b/.k itchen.yml | |
| 12 | index a389 d99..fbebe 56 100644 | |
| 13 | --- a/.kit chen.yml | |
| 14 | +++ b/.kit chen.yml | |
| 15 | @@ -25,7 + 25,7 @@ pl atforms: | |
| 16 | - name: u buntu-14.0 4 | |
| 17 | driver_ config: | |
| 18 | box: opscode-ub untu-14.04 | |
| 19 | - box_u rl: https: //opscode- vm-bento.s 3.amazonaw s.com/vagr ant/opscod e_ubuntu-1 4.04_provi sionerless .box | |
| 20 | + box_u rl: http:/ /opscode-v m-bento.s3 .amazonaws .com/vagra nt/virtual box/opscod e_ubuntu-1 4.04_chef- provisione rless.box | |
| 21 | run_lis t: | |
| 22 | - rec ipe[packag ecloud_tes t::trusty_ deps] | |
| 23 | - rec ipe[packag ecloud_tes t::deb] | |
| 24 | @@ -56,7 + 56,24 @@ p latforms: | |
| 25 | - rec ipe[packag ecloud_tes t::rpm] | |
| 26 | - rec ipe[packag ecloud_tes t::rubygem s_private] | |
| 27 | ||
| 28 | +- name: a mazon-2014 .09 | |
| 29 | + driver_ plugin: ec 2 | |
| 30 | + driver_ config: | |
| 31 | + image _id: ami-b 5a7ea85 | |
| 32 | + username: REDACTED | |
| 33 | + aws_a ccess_key_ id: <%= EN V['AWS_ACC ESS_KEY_ID '] %> | |
| 34 | + aws_s ecret_acce ss_key: <% = ENV['AWS _SECRET_AC CESS_KEY'] %> | |
| 35 | + aws_s sh_key_id: <%= ENV[' AWS_KEYPAI R_NAME'] % > | |
| 36 | + ssh_k ey: <%= EN V['AWS_SSH _KEY_PATH' ] %> | |
| 37 | + avail ability_zo ne: us-wes t-2a | |
| 38 | + regio n: us-west -2 | |
| 39 | + flavo r_id: t2.m icro | |
| 40 | + secur ity_group_ ids: sg-59 8e583c | |
| 41 | + run_lis t: | |
| 42 | + - rec ipe[packag ecloud_tes t::rpm] | |
| 43 | + - rec ipe[packag ecloud_tes t::rubygem s] | |
| 44 | + | |
| 45 | suites: | |
| 46 | - name: d efault | |
| 47 | - run_lis t: | |
| 48 | - attribu tes: {} | |
| 49 | +run_list: | |
| 50 | +attribute s: {} | |
| 51 | diff --git a/Gemfile b/Gemfile | |
| 52 | index 9ce1 223..9b9ee 17 100644 | |
| 53 | --- a/Gemf ile | |
| 54 | +++ b/Gemf ile | |
| 55 | @@ -2,6 +2 ,7 @@ sour ce 'https: //rubygems .org' | |
| 56 | ||
| 57 | gem 'rake ' | |
| 58 | gem 'berk shelf', '~ > 3.1.4' | |
| 59 | +gem 'kitc hen-ec2' | |
| 60 | ||
| 61 | group :te st do | |
| 62 | gem 'fo odcritic', '~> 4.0.0 ' | |
| 63 | -- | |
| 64 | 1.9.2 | |
| 65 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.