Git output 1

d89ddb1 (from 95febfb) Merge branch 'master' of ../jenkins into alex/jenkins
A	.gitignore
A	.rspec
A	Gemfile
A	Makefile
A	README.md
A	TODO.md
A	assets.json
A	bake.sh
A	cloudformation/buildbox.yml
A	cloudformation/jumpbox.yml
A	cloudformation/kms.yml
A	cloudformation/s3.yml
A	cloudformation/userdata/buildbox.xml.template
A	cloudformation/userdata/configure_ad.xml.template
A	cloudformation/userdata/control_m.xml.template
A	cloudformation/userdata/footer.xml.template
A	cloudformation/userdata/header.xml.template
A	cloudformation/userdata/jumpbox.xml.template
A	cloudformation/userdata/win_domain_join.xml.template
A	data/stage/cloudformation/stack/kms.sh
A	data/stage/cloudformation/stack/s3.sh
A	data/stage/cloudformation/stack/tdm_central.sh
A	data/stage/cloudformation/tdm/ec2.sh
A	data/stage/cloudformation/tdm/rds.sh
A	data/stage/sam/stack/check_dynamodb_lock.sh
A	data/tdm/common.sh
A	delete_sam.sh
A	delete_stack.sh
A	deploy_sam.sh
A	deploy_stack.sh
A	helpers/assume_role.sh
A	helpers/cfn_flip_venv.sh
A	helpers/clean_up_amis.sh
A	helpers/configure_ad.sh
A	helpers/curl_ami.py
A	helpers/ec2_dev_environment.sh
A	helpers/encrypt_ami.sh
A	helpers/extract_mocks.sh
A	helpers/fix_bootstrap.sh
A	helpers/generate_csr.sh
A	helpers/kick_puppet.sh
A	helpers/rebake.sh
A	helpers/redeploy.sh
A	helpers/report_patches.py
A	helpers/share_ami.sh
A	helpers/sns_create_topic.sh
A	helpers/ssm_get.sh
A	helpers/ssm_get_by_path.sh
A	helpers/ssm_put.sh
A	helpers/update_dns.sh
A	helpers/update_jenkinsfile.sh
A	helpers/upload_server_cert.sh
A	include.sh
A	include/include.sh
A	include/shunit2
A	include/tdm
M	jenkins/.gitignore
D	jenkins/.rspec
D	jenkins/Gemfile
M	jenkins/Makefile
M	jenkins/README.md
M	jenkins/TODO.md
M	jenkins/assets.json
D	jenkins/bake.sh
M	jenkins/buildbox.yml
D	jenkins/cloudformation/buildbox.yml
D	jenkins/cloudformation/jumpbox.yml
D	jenkins/cloudformation/kms.yml
D	jenkins/cloudformation/s3.yml
D	jenkins/cloudformation/userdata/buildbox.xml.template
D	jenkins/cloudformation/userdata/configure_ad.xml.template
D	jenkins/cloudformation/userdata/control_m.xml.template
D	jenkins/cloudformation/userdata/footer.xml.template
D	jenkins/cloudformation/userdata/header.xml.template
D	jenkins/cloudformation/userdata/jumpbox.xml.template
D	jenkins/cloudformation/userdata/win_domain_join.xml.template
D	jenkins/data/stage/cloudformation/stack/kms.sh
D	jenkins/data/stage/cloudformation/stack/s3.sh
D	jenkins/data/stage/cloudformation/stack/tdm_central.sh
D	jenkins/data/stage/cloudformation/tdm/ec2.sh
D	jenkins/data/stage/cloudformation/tdm/rds.sh
D	jenkins/data/stage/sam/stack/check_dynamodb_lock.sh
D	jenkins/data/tdm/common.sh
D	jenkins/delete_sam.sh
D	jenkins/delete_stack.sh
D	jenkins/deploy_sam.sh
D	jenkins/deploy_stack.sh
D	jenkins/helpers/assume_role.sh
D	jenkins/helpers/cfn_flip_venv.sh
D	jenkins/helpers/clean_up_amis.sh
D	jenkins/helpers/configure_ad.sh
D	jenkins/helpers/curl_ami.py
D	jenkins/helpers/ec2_dev_environment.sh
D	jenkins/helpers/encrypt_ami.sh
D	jenkins/helpers/extract_mocks.sh
D	jenkins/helpers/fix_bootstrap.sh
D	jenkins/helpers/generate_csr.sh
D	jenkins/helpers/kick_puppet.sh
D	jenkins/helpers/rebake.sh
D	jenkins/helpers/redeploy.sh
D	jenkins/helpers/report_patches.py
D	jenkins/helpers/share_ami.sh
D	jenkins/helpers/sns_create_topic.sh
D	jenkins/helpers/ssm_get.sh
D	jenkins/helpers/ssm_get_by_path.sh
D	jenkins/helpers/ssm_put.sh
D	jenkins/helpers/update_dns.sh
D	jenkins/helpers/update_jenkinsfile.sh
D	jenkins/helpers/upload_server_cert.sh
D	jenkins/include.sh
D	jenkins/include/include.sh
D	jenkins/include/shunit2
D	jenkins/include/tdm
D	jenkins/packer/buildbox.json
D	jenkins/packer/linux/edit_proxy.sh
D	jenkins/packer/linux/install_control_m.sh
D	jenkins/packer/linux/locate_ip.sh
D	jenkins/packer/windows/amazon-cloudwatch-agent.json
D	jenkins/packer/windows/install-cloudwatch-agent.ps1
D	jenkins/patches/add_hip_notify.sh
D	jenkins/patches/add_misc_test_to_makefiles.sh
D	jenkins/patches/add_missing_exit_to_ssm_get.sh
D	jenkins/patches/add_validate_vars_lines.sh
D	jenkins/patches/edit_s3_policies.sh
D	jenkins/patches/generalise_user_data.sh
D	jenkins/patches/insert_parameters_json_test.sh
D	jenkins/patches/migrate_to_gen3.sh
D	jenkins/patches/migrate_to_updated_kms.sh
D	jenkins/patches/remove_invalid_ami_stacks_var.sh
D	jenkins/patches/rename_api_key.patch
D	jenkins/patches/rename_api_key.sh
D	jenkins/patches/set_up_initial_mocks.sh
D	jenkins/patches/update_application_id.sh
D	jenkins/patches/update_comment_in_jenkinsfile_bake.sh
D	jenkins/patches/update_different_ami.sh
D	jenkins/patches/update_get_latest_image.sh
D	jenkins/patches/update_iam_prod_account_arn.sh
D	jenkins/patches/update_python_one_liner.sh
D	jenkins/patches/update_readmes.sh
D	jenkins/requirements.txt
D	jenkins/spec/localhost/packer/control_m_spec.rb
D	jenkins/spec/localhost/userdata/control_m_spec.rb
D	jenkins/tdm/Jenkinsfile/tdm-bake-ec2
D	jenkins/tdm/Jenkinsfile/tdm-bake-rds
D	jenkins/tdm/Jenkinsfile/tdm-bake.groovy
D	jenkins/tdm/Jenkinsfile/tdm-pipeline-ec2
D	jenkins/tdm/Jenkinsfile/tdm-pipeline-rds
D	jenkins/tdm/Jenkinsfile/tdm-pipeline.groovy
D	jenkins/tdm/README.md
D	jenkins/tdm/cloudformation/central/tdm_central.yml
D	jenkins/tdm/cloudformation/maskingstack_ec2.yml
D	jenkins/tdm/cloudformation/maskingstack_rds.yml
D	jenkins/tdm/cloudformation/sns.yml
D	jenkins/tdm/packer/app_server.json
D	jenkins/tdm/run_stage.sh
D	jenkins/tdm/sam/.gitkeep
D	jenkins/tdm/sam/check_dynamodb_lock.yml
D	jenkins/tdm/sam/check_dynamodb_lock/__init__.py
D	jenkins/tdm/sam/check_dynamodb_lock/function.py
D	jenkins/tdm/sam/check_dynamodb_lock/requirements.txt
D	jenkins/tdm/scripts/break-dynamo-lock.sh
D	jenkins/tdm/scripts/cleanup.sh
D	jenkins/tdm/scripts/configDBWallet.sh
D	jenkins/tdm/scripts/create_oracle_wallet.sh
D	jenkins/tdm/scripts/create_tdm_user_ec2.sh
D	jenkins/tdm/scripts/create_tdm_user_rds.sh
D	jenkins/tdm/scripts/create_tdm_wallet.sh
D	jenkins/tdm/scripts/generatemapping.sh
D	jenkins/tdm/scripts/get_release_lookup_values.sh
D	jenkins/tdm/scripts/mask_phase1.sh
D	jenkins/tdm/scripts/mask_phase2.sh
D	jenkins/tdm/scripts/mask_phase3.sh
D	jenkins/tdm/scripts/mask_phase4.sh
D	jenkins/tdm/scripts/provision.sh
D	jenkins/tdm/scripts/re-encrypt.sh
D	jenkins/tdm/scripts/run_packer.sh
D	jenkins/tdm/scripts/share.sh
D	jenkins/tdm/scripts/tdmdeploy.sh
D	jenkins/test.json
A	packer/buildbox.json
A	packer/linux/edit_proxy.sh
A	packer/linux/install_control_m.sh
A	packer/linux/locate_ip.sh
A	packer/windows/amazon-cloudwatch-agent.json
A	packer/windows/install-cloudwatch-agent.ps1
A	patches/add_hip_notify.sh
A	patches/add_misc_test_to_makefiles.sh
A	patches/add_missing_exit_to_ssm_get.sh
A	patches/add_validate_vars_lines.sh
A	patches/edit_s3_policies.sh
A	patches/generalise_user_data.sh
A	patches/insert_parameters_json_test.sh
A	patches/migrate_to_gen3.sh
A	patches/migrate_to_updated_kms.sh
A	patches/remove_invalid_ami_stacks_var.sh
A	patches/rename_api_key.patch
A	patches/rename_api_key.sh
A	patches/set_up_initial_mocks.sh
A	patches/update_application_id.sh
A	patches/update_comment_in_jenkinsfile_bake.sh
A	patches/update_different_ami.sh
A	patches/update_get_latest_image.sh
A	patches/update_iam_prod_account_arn.sh
A	patches/update_python_one_liner.sh
A	patches/update_readmes.sh
A	requirements.txt
A	spec/localhost/packer/control_m_spec.rb
A	spec/localhost/userdata/control_m_spec.rb
A	tdm/Jenkinsfile/tdm-bake-ec2
A	tdm/Jenkinsfile/tdm-bake-rds
A	tdm/Jenkinsfile/tdm-bake.groovy
A	tdm/Jenkinsfile/tdm-pipeline-ec2
A	tdm/Jenkinsfile/tdm-pipeline-rds
A	tdm/Jenkinsfile/tdm-pipeline.groovy
A	tdm/README.md
A	tdm/cloudformation/central/tdm_central.yml
A	tdm/cloudformation/maskingstack_ec2.yml
A	tdm/cloudformation/maskingstack_rds.yml
A	tdm/cloudformation/sns.yml
A	tdm/packer/app_server.json
A	tdm/run_stage.sh
A	tdm/sam/.gitkeep
A	tdm/sam/check_dynamodb_lock.yml
A	tdm/sam/check_dynamodb_lock/__init__.py
A	tdm/sam/check_dynamodb_lock/function.py
A	tdm/sam/check_dynamodb_lock/requirements.txt
A	tdm/scripts/break-dynamo-lock.sh
A	tdm/scripts/cleanup.sh
A	tdm/scripts/configDBWallet.sh
A	tdm/scripts/create_oracle_wallet.sh
A	tdm/scripts/create_tdm_user_ec2.sh
A	tdm/scripts/create_tdm_user_rds.sh
A	tdm/scripts/create_tdm_wallet.sh
A	tdm/scripts/generatemapping.sh
A	tdm/scripts/get_release_lookup_values.sh
A	tdm/scripts/mask_phase1.sh
A	tdm/scripts/mask_phase2.sh
A	tdm/scripts/mask_phase3.sh
A	tdm/scripts/mask_phase4.sh
A	tdm/scripts/provision.sh
A	tdm/scripts/re-encrypt.sh
A	tdm/scripts/run_packer.sh
A	tdm/scripts/share.sh
A	tdm/scripts/tdmdeploy.sh
A	test.json
d89ddb1 (from f85c1bb) Merge branch 'master' of ../jenkins into alex/jenkins
A	.gitignore
A	.rspec
A	Gemfile
A	Makefile
A	README.md
A	TODO.md
A	assets.json
A	bake.sh
A	cloudformation/buildbox.yml
A	cloudformation/jumpbox.yml
A	cloudformation/kms.yml
A	cloudformation/s3.yml
A	cloudformation/userdata/buildbox.xml.template
A	cloudformation/userdata/configure_ad.xml.template
A	cloudformation/userdata/control_m.xml.template
A	cloudformation/userdata/footer.xml.template
A	cloudformation/userdata/header.xml.template
A	cloudformation/userdata/jumpbox.xml.template
A	cloudformation/userdata/win_domain_join.xml.template
A	data/stage/cloudformation/stack/kms.sh
A	data/stage/cloudformation/stack/s3.sh
A	data/stage/cloudformation/stack/tdm_central.sh
A	data/stage/cloudformation/tdm/ec2.sh
A	data/stage/cloudformation/tdm/rds.sh
A	data/stage/sam/stack/check_dynamodb_lock.sh
A	data/tdm/common.sh
A	delete_sam.sh
A	delete_stack.sh
A	deploy_sam.sh
A	deploy_stack.sh
A	helpers/assume_role.sh
A	helpers/cfn_flip_venv.sh
A	helpers/clean_up_amis.sh
A	helpers/configure_ad.sh
A	helpers/curl_ami.py
A	helpers/ec2_dev_environment.sh
A	helpers/encrypt_ami.sh
A	helpers/extract_mocks.sh
A	helpers/fix_bootstrap.sh
A	helpers/generate_csr.sh
A	helpers/kick_puppet.sh
A	helpers/rebake.sh
A	helpers/redeploy.sh
A	helpers/report_patches.py
A	helpers/share_ami.sh
A	helpers/sns_create_topic.sh
A	helpers/ssm_get.sh
A	helpers/ssm_get_by_path.sh
A	helpers/ssm_put.sh
A	helpers/update_dns.sh
A	helpers/update_jenkinsfile.sh
A	helpers/upload_server_cert.sh
A	include.sh
A	include/include.sh
A	include/shunit2
A	include/tdm
A	packer/buildbox.json
A	packer/linux/edit_proxy.sh
A	packer/linux/install_control_m.sh
A	packer/linux/locate_ip.sh
A	packer/windows/amazon-cloudwatch-agent.json
A	packer/windows/install-cloudwatch-agent.ps1
A	patches/add_hip_notify.sh
A	patches/add_misc_test_to_makefiles.sh
A	patches/add_missing_exit_to_ssm_get.sh
A	patches/add_validate_vars_lines.sh
A	patches/edit_s3_policies.sh
A	patches/generalise_user_data.sh
A	patches/insert_parameters_json_test.sh
A	patches/migrate_to_gen3.sh
A	patches/migrate_to_updated_kms.sh
A	patches/remove_invalid_ami_stacks_var.sh
A	patches/rename_api_key.patch
A	patches/rename_api_key.sh
A	patches/set_up_initial_mocks.sh
A	patches/update_application_id.sh
A	patches/update_comment_in_jenkinsfile_bake.sh
A	patches/update_different_ami.sh
A	patches/update_get_latest_image.sh
A	patches/update_iam_prod_account_arn.sh
A	patches/update_python_one_liner.sh
A	patches/update_readmes.sh
A	readme/README.erb
A	readme/asset_README.erb
A	readme/asset_docs.rb
A	readme/docs.rb
A	readme/toc.rb
A	requirements.txt
A	shunit2/_shared.sh
A	shunit2/_shared/bake.sh
A	shunit2/_shared/deploy_stack.sh
A	shunit2/_shared/jenkinsfiles.sh
A	shunit2/_shared/misc.sh
A	shunit2/_shared/sorting.sh
A	shunit2/_shared/tdm/scripts/cleanup.sh
A	shunit2/_shared/tdm/scripts/create_tdm_user_ec2.sh
A	shunit2/_shared/tdm/scripts/create_tdm_user_rds.sh
A	shunit2/_shared/tdm/scripts/generatemapping.sh
A	shunit2/_shared/tdm/scripts/mask_phase1.sh
A	shunit2/_shared/tdm/scripts/mask_phase2.sh
A	shunit2/_shared/tdm/scripts/mask_phase3.sh
A	shunit2/_shared/tdm/scripts/mask_phase4.sh
A	shunit2/_shared/tdm/scripts/provision.sh
A	shunit2/_shared/tdm/scripts/re-encrypt.sh
A	shunit2/_shared/tdm/scripts/run_packer.sh
A	shunit2/_shared/tdm/scripts/tdmdeploy.sh
A	shunit2/_shared/tdm_jenkinsfiles.sh
A	shunit2/_shared/usage.sh
A	shunit2/_shared/validate_templates.sh
A	shunit2/_shared/whitespace.sh
A	shunit2/bake.sh
A	shunit2/cloudformation/userdata/configure_ad.sh
A	shunit2/cloudformation/userdata/control_m.sh
A	shunit2/delete_stack.sh
A	shunit2/deploy_stack.sh
A	shunit2/fixtures/.gitkeep
A	shunit2/fixtures/CONFIG.dat
A	shunit2/fixtures/OS.dat
A	shunit2/fixtures/userdata/template1.xml.template
A	shunit2/fixtures/userdata/template2.xml.template
A	shunit2/helpers/encrypt_ami.sh
A	shunit2/helpers/share_ami.sh
A	shunit2/include.sh
A	shunit2/kms_data.sh
A	shunit2/packer/linux/install_control_m.sh
A	shunit2/tdm/bash_n.sh
A	shunit2/tdm/scripts/cleanup.sh
A	shunit2/tdm/scripts/create_oracle_wallet.sh
A	shunit2/tdm/scripts/create_tdm_user_ec2.sh
A	shunit2/tdm/scripts/create_tdm_user_rds.sh
A	shunit2/tdm/scripts/create_tdm_wallet.sh
A	shunit2/tdm/scripts/generatemapping.sh
A	shunit2/tdm/scripts/mask_phase1.sh
A	shunit2/tdm/scripts/mask_phase2.sh
A	shunit2/tdm/scripts/mask_phase3.sh
A	shunit2/tdm/scripts/mask_phase4.sh
A	shunit2/tdm/scripts/provision.sh
A	shunit2/tdm/scripts/re-encrypt.sh
A	shunit2/tdm/scripts/run_packer.sh
A	shunit2/tdm/scripts/tdmdeploy.sh
A	shunit2/yamllint.yml
A	spec/localhost/packer/control_m_spec.rb
A	spec/localhost/userdata/control_m_spec.rb
A	tdm/Jenkinsfile/tdm-bake-ec2
A	tdm/Jenkinsfile/tdm-bake-rds
A	tdm/Jenkinsfile/tdm-bake.groovy
A	tdm/Jenkinsfile/tdm-pipeline-ec2
A	tdm/Jenkinsfile/tdm-pipeline-rds
A	tdm/Jenkinsfile/tdm-pipeline.groovy
A	tdm/README.md
A	tdm/cloudformation/central/tdm_central.yml
A	tdm/cloudformation/maskingstack_ec2.yml
A	tdm/cloudformation/maskingstack_rds.yml
A	tdm/cloudformation/sns.yml
A	tdm/packer/app_server.json
A	tdm/run_stage.sh
A	tdm/sam/.gitkeep
A	tdm/sam/check_dynamodb_lock.yml
A	tdm/sam/check_dynamodb_lock/__init__.py
A	tdm/sam/check_dynamodb_lock/function.py
A	tdm/sam/check_dynamodb_lock/requirements.txt
A	tdm/scripts/break-dynamo-lock.sh
A	tdm/scripts/cleanup.sh
A	tdm/scripts/configDBWallet.sh
A	tdm/scripts/create_oracle_wallet.sh
A	tdm/scripts/create_tdm_user_ec2.sh
A	tdm/scripts/create_tdm_user_rds.sh
A	tdm/scripts/create_tdm_wallet.sh
A	tdm/scripts/generatemapping.sh
A	tdm/scripts/get_release_lookup_values.sh
A	tdm/scripts/mask_phase1.sh
A	tdm/scripts/mask_phase2.sh
A	tdm/scripts/mask_phase3.sh
A	tdm/scripts/mask_phase4.sh
A	tdm/scripts/provision.sh
A	tdm/scripts/re-encrypt.sh
A	tdm/scripts/run_packer.sh
A	tdm/scripts/share.sh
A	tdm/scripts/tdmdeploy.sh
A	test.json