00ad41bf7d
google: Code formatted via gofmt
2015-08-14 12:06:06 +01:00
b95e7a976c
fail silently when users have forbiddenaccount/allowedaccount configured while authenticating via iam profile instance
2015-08-14 03:52:38 -07:00
55411d692d
provider/aws: add value into ELB name validation message
...
makes debugging these validation errors much more straightforward
2015-08-13 16:31:18 -05:00
75c1475cc1
Convert int to int64 when building the cluster.NodeConfig struct
...
related to issue https://github.com/hashicorp/terraform/issues/2901
2015-08-11 08:27:32 -04:00
ca993a5a5e
provider/aws: match with upstream changes
2015-08-10 15:39:47 -05:00
eb90457223
guard on both accessdenied (no IAM policy) and validationerror (no username specified)
2015-08-07 11:55:44 -05:00
31fab62bfd
provider/aws: Fail silently in ValidateCredentials for IAM users
2015-08-07 11:40:50 -05:00
79d8fde09c
Pass key_name and subnetId to spot instance request
2015-08-06 20:22:10 +01:00
c1daf23a5d
provider/aws: Fix issues with TestAccAWSPolicyAttachment_basic
2015-08-06 09:47:35 -05:00
a1a78bd482
provider/aws: Add ARN to Dynamo schema
2015-08-05 14:43:26 -05:00
b779144a1e
Merge pull request #2924 from calvinfo/f-aws-dynamo-arn
...
provider/aws: Add arn attribute for DynamoDB tables
2015-08-05 14:42:20 -05:00
bfaea76b86
more tightly scope s3 bucket object error
2015-08-05 14:27:34 -05:00
285b4061db
Merge remote-tracking branch 'upstream/master' into f-aws-s3-object-pr-2079
...
* upstream/master:
Update CHANGELOG.md
Update CHANGELOG.md
provider/aws: allow external ENI attachments
Update AWS provider documentation
docs/aws: Fix example of aws_iam_role_policy
provider/aws: S3 bucket test that should fail
provider/aws: Return if Bucket not found
Update CHANGELOG.md
Update CHANGELOG.md
helper/schema: record schema version when destroy fails
settings file is not required
provider/azure: Allow settings_file to accept XML string
add note to aws_iam_policy_attachment explaining its use/limitations
docs: clarify template_file path information
google: Sort resources by alphabet in docs
Support go get in go 1.5
Update CHANGELOG.md
aws_network_interface attachment block is not required
provider/aws: Fix issue in Security Group Rules where the Security Group is not found
2015-08-05 13:45:06 -05:00
941ce5560a
Merge pull request #2925 from hashicorp/b-aws-s3-return-on-err
...
provider/aws: Return if Bucket not found
2015-08-05 13:31:21 -05:00
3de3002b49
provider/aws: allow external ENI attachments
...
If Terraform creates an ENI and it's attached out of band, Terraform
should not attempt to remove the attachment on subsequent runs.
fixes #2436
fixes #2881
2015-08-05 11:07:07 -05:00
8d5fe93152
conditionally set InstanceInitiatedShutdownBehavior
2015-08-04 06:09:47 -05:00
83827a5cb7
provider/aws: S3 bucket test that should fail
2015-08-03 16:30:54 -05:00
c10c47623e
provider/aws: Return if Bucket not found
2015-08-03 16:17:01 -05:00
cb2d90a7d9
provider/aws: Add arn attribute for DynamoDB tables
...
This commit exports the `arn` as well as the `id`, since IAM
roles require the full resource name rather than just the table
name. I'd even be in favor or having `arn` as the `id` since the
<region, tablename> pair is the uniqueness constraint, but this
will keep backwards compatibility:
http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_CreateTable.html
2015-08-03 14:10:18 -07:00
27b1aa6637
Merge pull request #2922 from hashicorp/azure-settings-file
...
provider/azure: Allow settings_file to accept XML string
2015-08-03 16:05:00 -05:00
a7543de393
settings file is not required
2015-08-03 15:34:34 -05:00
2a5c18d88b
provider/azure: Allow settings_file to accept XML string
2015-08-03 15:31:25 -05:00
44f470514c
provider/aws: Add S3 Bucket Object (supercedes #2079 )
2015-07-30 15:17:37 -05:00
5c6083e1c4
Merge branch 'master' into f-aws-s3-object-pr-2079
...
* master: (720 commits)
Update CHANGELOG.md
Update CHANGELOG.md
dynamodb-local Update AWS config https://github.com/hashicorp/terraform/pull/2825#issuecomment-126353610
Make target_pools optional
Update CHANGELOG.md
code formatting
Update CHANGELOG.md
providers/google: Fix reading account_file path
providers/google: Fix error appending
providers/google: Return if we could parse JSON
providers/google: Change account_file to JSON
providers/google: Default account_file* to empty
providers/google: Add account_file/account_file_contents ConflictsWith
providers/google: Document account_file_contents
providers/google: Use account_file_contents if provided
providers/google: Add account_file_contents to provider
Update CHANGELOG.md
Update CHANGELOG.md
dynamodb-local Use ` instead of : to refer region to keep the consistency with the provider docs
dynamodb-local Update aws provider docs to include the `dynamodb_endpoint` argument
...
2015-07-30 14:30:35 -05:00
f4fb053982
provider/aws: Fix issue in Security Group Rules where the Security Group is not found
2015-07-30 14:10:19 -05:00
6e7c6122e9
Merge pull request #2894 from sparkprime/optional_target_pool
...
Make target_pools optional
2015-07-30 13:52:44 -04:00
5930f22974
dynamodb-local Update AWS config
...
https://github.com/hashicorp/terraform/pull/2825#issuecomment-126353610
Tks @catsby
2015-07-30 12:21:03 -03:00
28bef7c0c7
Merge branch 'master' into dynamodb-local
2015-07-30 12:16:07 -03:00
65ba4c1b06
Make target_pools optional
2015-07-30 10:46:16 -04:00
26b416335f
Merge pull request #2861 from hashicorp/b-azure-instance-error
...
provider/azure: Provide a simpler error when using a Platform Image without a Storage Service
2015-07-30 09:28:33 -05:00
488587467c
code formatting
2015-07-30 09:27:13 -05:00
30572212f2
Merge branch 'master' into pr-2779
...
* master: (86 commits)
providers/google: Fix reading account_file path
providers/google: Fix error appending
providers/google: Return if we could parse JSON
providers/google: Change account_file to JSON
providers/google: Default account_file* to empty
providers/google: Add account_file/account_file_contents ConflictsWith
providers/google: Document account_file_contents
providers/google: Use account_file_contents if provided
providers/google: Add account_file_contents to provider
Update CHANGELOG.md
Update CHANGELOG.md
use d.Id()
Update CHANGELOG.md
Update CHANGELOG.md
scripts: change website_push to push from HEAD
update analytics
core: fix crash on provider warning
provider/aws: Update source to comply with upstream breaking change
Update CHANGELOG.
provider/aws: Fix issue with IAM Server Certificates and Chains
...
2015-07-29 15:54:56 -05:00
7884456c4b
providers/google: Fix reading account_file path
2015-07-29 15:59:33 -04:00
4764a556c0
providers/google: Fix error appending
2015-07-29 15:59:33 -04:00
8faa111156
providers/google: Return if we could parse JSON
2015-07-29 15:59:32 -04:00
773852e2d5
providers/google: Change account_file to JSON
...
If JSON fails to parse, treat it as a file path
2015-07-29 15:59:32 -04:00
2a04708d66
providers/google: Default account_file* to empty
...
Prevents prompting for input
2015-07-29 15:59:32 -04:00
a7ca7e0b36
providers/google: Add account_file/account_file_contents ConflictsWith
2015-07-29 15:59:32 -04:00
4ce776d252
providers/google: Use account_file_contents if provided
2015-07-29 15:59:32 -04:00
a8d0a70c03
providers/google: Add account_file_contents to provider
2015-07-29 15:59:32 -04:00
1043fb7c88
Merge pull request #2842 from hashicorp/aws-elasticache-debug
...
provider/aws: Fix issue with checking for ElastiCache cluster status
2015-07-29 11:42:12 -05:00
75492513ec
dynamodb-local Use ` instead of : to refer region to keep the consistency with the
...
provider docs
2015-07-29 13:36:02 -03:00
d3b93d54fb
use d.Id()
2015-07-29 11:13:19 -05:00
0aafacf3c3
Merge branch 'master' into aws-elasticache-debug
...
* master: (33 commits)
Update CHANGELOG.md
Update CHANGELOG.md
scripts: change website_push to push from HEAD
update analytics
provider/aws: Update source to comply with upstream breaking change
Update CHANGELOG.
provider/aws: Fix issue with IAM Server Certificates and Chains
Increase timeout, IGM delete can be slow
Make failure of "basic" test not interfere with success of "update" test
Update CHANGELOG.md
Use new autoscaler / instance group manager APIs.
Compute private ip addresses of ENIs if they are not specified
Update CHANGELOG.md
Update CHANGELOG.md
provider/aws: Error when unable to find a Root Block Device name
Update CHANGELOG.md
aws_db_instance: Add mixed-case engine test to ensure StateFunc works.
aws_db_instance: Only write lowercase engines to the state file.
Update CHANGELOG.md
Split AWS provider topics by service.
...
2015-07-29 11:07:01 -05:00
3b8df13142
Merge pull request #2816 from TimeIncOSS/f-aws-elb-name-test
...
provider/aws: Add acceptance test for ELB w/out name
2015-07-29 10:50:49 -05:00
6339e18f14
Merge pull request #2871 from hashicorp/b-aws-server-sert-fixes
...
provider/aws: Fix issue with IAM Server Certificates and Chains
2015-07-29 09:37:51 -05:00
efaf63969c
Merge pull request #2777 from dwradcliffe/dnsimple_force_new
...
provider/dnsimple: domain and type should force new records
2015-07-29 09:34:24 -05:00
7de7a406f3
Merge pull request #2874 from hashicorp/b-aws-upstream-fixes
...
provider/aws: Update source to comply with upstream breaking change
2015-07-28 15:59:16 -05:00
579ccbefea
provider/aws: Update source to comply with upstream breaking change
2015-07-28 15:29:46 -05:00
4fa68716c2
Merge pull request #2868 from sparkprime/gce_autoscaling
...
Gce autoscaling
2015-07-28 15:59:29 -04:00
8527174c6e
provider/aws: Fix issue with IAM Server Certificates and Chains
2015-07-28 14:02:26 -05:00
e8e5495483
Increase timeout, IGM delete can be slow
2015-07-28 14:09:43 -04:00
24167b1085
Make failure of "basic" test not interfere with success of "update" test
2015-07-28 14:09:29 -04:00
5544dac7c6
Merge branch 'master' into gce_autoscaling
2015-07-27 20:48:39 -04:00
1ec247ef37
Use new autoscaler / instance group manager APIs.
2015-07-27 20:47:10 -04:00
affa09efdd
Compute private ip addresses of ENIs if they are not specified
...
As AWS will assign the ENI an address
2015-07-27 23:24:49 +00:00
8a4fbbf64c
Merge pull request #2745 from ctiwald/ct/lowercase-engine
...
aws_db_instance: Downcase "engine" for RDS
2015-07-27 14:27:32 -05:00
99f9b93b57
provider/aws: Error when unable to find a Root Block Device name
...
Fixes #2633
2015-07-27 10:59:37 -05:00
493b31d122
provider/azure: Trap a specific Platform Image error in a new PlatformStorageError
2015-07-27 10:23:42 -05:00
4f085ba550
aws_db_instance: Add mixed-case engine test to ensure StateFunc works.
2015-07-24 16:32:21 -04:00
dfe0efaf17
aws_db_instance: Only write lowercase engines to the state file.
...
Amazon accepts mixed-case engines, but only returns lowercase. Without
the proper StateFunc, every apply of a mixed-case engine will result in
a new db instance. Standardize on lowercase.
2015-07-24 16:32:21 -04:00
b75b40553d
Merge pull request #2806 from hashicorp/b-aws-lc-cleanup
...
provider/aws: Clean up externally removed Launch Configurations
2015-07-24 12:00:49 -05:00
8ac28c12f3
provider/aws: Fix issue with checking for ElastiCache cluster status
2015-07-24 11:43:28 -05:00
5554942721
This adds the source_dest_check attribute to the aws_network_interface resource
...
Defaults to true to be consistent with AWS
2015-07-23 06:16:51 +00:00
35201e730e
dynamodb-local Add `dynamodb_endpoint` allowing to change the DynamoDB Endpoint for
...
example to connect to dynamodb-local
2015-07-22 18:57:29 -03:00
cbe9be4571
Add website_domain for S3 buckets.
2015-07-22 10:38:28 -05:00
57dfaa4922
provider/aws: Add acceptance test for ELB w/out name
2015-07-22 14:33:57 +02:00
f979fd7dee
Merge pull request #2571 from TimeIncOSS/f-aws-autogenerated-elb-name
...
provider/aws: Allow ELB name to be generated
2015-07-21 15:52:36 -05:00
b720387449
provider/aws: Clean up externally removed Launch Configurations
...
Handle Launch Configurations that are not found more gracefully, but tolerating
an additional API error indicating the LC no longer exists.
2015-07-21 11:13:41 -05:00
4532f3ddcc
Merge pull request #2805 from rnaveiras/spot-instance-typo
...
Amend AWS spot instace state name cancelled
2015-07-21 10:43:31 -05:00
f3149e9ea5
Merge pull request #2804 from hashicorp/testacc-convergence
...
provider/aws: Converge on TestAccAWS for acceptance tests names
2015-07-21 10:34:00 -05:00
87239dcec8
Amend AWS spot instace state name cancelled
2015-07-21 17:26:00 +02:00
81957f7453
Merge pull request #2794 from hashicorp/b-aws-instance-monitoring
...
provider/aws: Fix issue with toggling monitoring in AWS Instances
2015-07-21 10:22:37 -05:00
3688d4ba00
provider/aws: Converge on TestAccAWS for acceptance tests names
...
An attempt to converge the tests into a standard naming scheme
- TestAccAWS for aws tests
- a `_basic` test for each suite, save a few that are quick (Network ACLs, for
example)
2015-07-21 09:42:02 -05:00
4797a82e1a
aws: Simplify ValidateCredentials func
2015-07-21 15:57:59 +02:00
70cf3a7ace
Merge pull request #2730 from hashicorp/f-aws-fail-nicer
...
provider/aws: Check credentials before attempting to do anything
2015-07-21 08:34:55 -05:00
c6f0bf479b
Merge branch 'master' into gce_autoscaling
2015-07-20 14:25:26 -04:00
60305cb879
Merge pull request #2728 from hashicorp/b-aws-db-param-bug
...
provider/aws: Fix issue with detecting differences in DB Parameters
2015-07-20 12:38:17 -05:00
db5d0301d8
provider/aws: Fix issue with toggling monitoring in AWS Instances
2015-07-20 12:32:58 -05:00
885b4e9278
Updating the test accordingly...
2015-07-20 18:34:44 +02:00
df909ca3ca
Fix an issue with `sudo` and `hints`
...
Fixes issue #2781
2015-07-20 18:31:32 +02:00
521451db4d
provider/aws/aws_instance: add new argument `instance_initiated_shutdown_behavior`,
...
accepts string values of 'stop' or 'terminate'.
Signed-off-by: Marc Tamsky <tamsky@users.noreply.github.com>
2015-07-18 09:45:34 -07:00
f1cc9fafb3
“DNS Simple” should be “DNSimple”
2015-07-17 23:18:28 -04:00
94ef573b66
DNSimple does not support changing a record domain or type
2015-07-17 17:06:01 -04:00
0308390df9
Merge pull request #2753 from svanharmelen/f-cloudstack-options
...
provider/cloudstack: add new provider option and some more...
2015-07-16 22:03:13 +02:00
e1d5af8ccf
Fixing the build...
...
The v0.beta is removed, so I also removed it from here. Strangely
enough I cannot find any code that actually used it other then in being
instantiated in the provider config func.
2015-07-16 18:44:09 +02:00
9897e55594
Fixing last test
2015-07-16 17:58:52 +02:00
28b7b53be6
Updates and tweaks
2015-07-16 17:40:11 +02:00
1091884735
provider/aws: Fix issue with Launch Configurations and enable_monitoring
...
Can now set this value to false. Fixes #2734
2015-07-15 10:42:39 -05:00
abe62e635a
Merge pull request #2724 from hashicorp/f-aws-asg-updates
...
provider/aws: Improved Auto Scaling Groups updates
2015-07-15 08:42:54 -05:00
975e1a6c2c
provider/aws: Check credentials before attempting to do anything
2015-07-14 16:39:50 -05:00
7756bf3aef
provider/aws: Fix issue with detecting differences in DB Parameters
...
Fixes #2718
2015-07-14 14:47:18 -05:00
4d1d4ea0df
provider/aws: Add acceptance tests for aws_vpc_endpoint
2015-07-14 18:48:41 +01:00
f9e825efca
provider/aws: Add new resource - aws_vpc_endpoint
2015-07-14 18:48:41 +01:00
04a5890853
minor fix to the test
2015-07-14 10:39:31 -05:00
ed98e02e4a
provider/aws: Improved Auto Scaling Groups updates
...
- availability zones are optional if you specify a VPC Zone Identifier (subnet)
- availability zones can be updated in place
2015-07-14 10:19:10 -05:00
c4a2df9e93
aws: Improve formatting of debug logs
2015-07-12 15:36:47 +01:00
9882cc59d8
aws: Add regression test for renaming ecs_cluster
2015-07-12 14:37:39 +01:00
21e4b5e3cf
aws: Use ClientToken when creating ecs_service
2015-07-12 14:37:39 +01:00
c72c5cebff
aws: Allow migrating (recreating) ecs_service to another cluster
2015-07-12 14:37:39 +01:00
37d10ebf37
aws: Retry ecs_cluster deletion if instances or services are active
2015-07-12 14:37:30 +01:00
0df8bf90c7
Merge pull request #2357 from TimeIncOSS/gke
...
Add support for GKE (Google Container Engine)
2015-07-11 14:14:50 -04:00
f5e22d0675
Add new resource - google_container_cluster
2015-07-11 18:56:24 +01:00
4a8ef78d33
Fixes #2676 by prefixing all Windows commands
...
By prefixing them with `cmd /c` it will work with both `winner` and
`ssh` connection types.
This PR also reverts some bad stringer changes made in PR #2673
2015-07-10 12:56:27 +02:00
7c03b0dedc
provider/aws: Improve test name (underscores -> undocumentedCharacters)
...
- ref #2665
2015-07-10 08:13:05 +01:00
77e563d358
Merge pull request #2665 from bitglue/dots_in_subnetgroup
...
Allow dots in the name of aws_db_subnet_group
2015-07-10 08:00:31 +01:00
4be8ba6986
Merge pull request #2672 from alexsacr/master
...
provider/aws: fix missing format arg
2015-07-09 23:29:16 -06:00
97fd4f5b7d
Tweaking the tests
2015-07-09 21:29:27 +02:00
3cb2a3b0b8
aws_db_instance: fix missing format arg
2015-07-09 14:28:50 -05:00
0dc0cff14d
Merge pull request #2657 from blueharford/master
...
provisioner/chef: add secret key
2015-07-09 20:20:46 +02:00
fb1226321c
Allow dots in the name of aws_db_subnet_group
...
The RDS API reference doesn't say dots are allowed, but they are. For
the sake of people who have preexisting resources with dots in the
names, we should allow them also. Fixes #2664 .
2015-07-09 13:57:12 -04:00
4c1c67b520
Merge pull request #2626 from jtopjian/openstack-allow-empty-apikey-endpointtype
...
provider/openstack: Allow empty api_key and endpoint_type
2015-07-09 10:55:56 -06:00
6fbebe3172
provider/aws: bump internet gateway detach timeout
2015-07-09 10:42:16 -05:00
cda814d8b3
No need to do this as they both are in their own scope
2015-07-09 09:32:13 -04:00
4070805fcd
ran gofmt removed required, added IF
2015-07-09 09:05:12 -04:00
61f47d440d
correct space, fix reading of file
2015-07-08 20:06:37 -04:00
090248fab1
fix errors
2015-07-08 19:41:38 -04:00
cd58da773c
remove unused if
2015-07-08 15:25:00 -04:00
7f4a5ac413
fix if statement and condition
2015-07-08 15:09:17 -04:00
ef28007988
merge master
2015-07-08 13:05:33 -06:00
6e21ca50a0
add chef secret key
2015-07-08 14:52:23 -04:00
d34bd0d227
Merge pull request #2640 from hashicorp/b-aws-spot-instance-fix
...
provider/aws: Fix issue where spot instance requests would crash
2015-07-08 12:32:13 -06:00
f2ff63d0da
Merge pull request #2644 from hashicorp/b-aws-sg-account-update
...
provider/aws: Fix issue in Classic env with external Security Groups
2015-07-08 12:29:50 -06:00
82d142cc5f
Merge pull request #2634 from hashicorp/f-aws-elasticache-redis-s3-snap
...
provider/aws: Add support for restoring from Redis backup stored in S3
2015-07-08 11:51:23 -06:00
cc79e6cb8d
provider/aws: Fix issue in Classic env with external Security Groups
...
Linking a security group from another account requires setting the UserID, which
we were stripping out
2015-07-07 12:06:36 -06:00
49a01ee787
provider/aws: Add maintenance window to ElastiCache cluster
...
Implements #2612
2015-07-07 10:41:46 -06:00
2fedaa9a4b
provider/aws: Fix issue where spot instance requests would crash
...
Requests that are pending do not have an InstanceID
2015-07-07 09:48:04 -06:00
edf8948d52
provider/aws: Add support for restoring from Redis backup stored in S3
...
Fixes #2377
2015-07-06 16:19:15 -06:00
41a16b5719
Merge branch 'master' of https://github.com/hashicorp/terraform
2015-07-06 10:45:17 +03:00
5251193f87
Allow empty api_key and endpoint_type
...
These two provider options are optional though if they are not set,
the user will be prompted to enter values.
By changing them to use the envDefaultFuncAllowMissing, the values
are still passed in the environment if they are set and safely
discarded if they are not.
2015-07-06 03:14:13 +00:00
1c14bfd04d
Added the HTTPS proxy option
2015-07-03 16:27:52 +02:00
007ab6e503
Fixed the http_proxy
2015-07-03 15:04:58 +02:00
09e336a80a
Fix Repository attribute in docker client PullOptions for private registries.
2015-07-03 12:58:05 +03:00
0ba041912e
Add regression test for db_subnet_group w/ underscores
...
- ref https://github.com/hashicorp/terraform/issues/2603
2015-07-02 23:58:46 +02:00
127fa3090f
Merge pull request #2604 from CpuID/cpuid_gh2603
...
Allow underscores in aws_db_subnet_group name
2015-07-02 23:57:49 +02:00
460d49fd52
Merge pull request #2062 from reverbdotcom/adding-rds-snapshots
...
Adding rds snapshots
2015-07-02 08:56:51 -05:00
c0b692b360
allow underscores in aws_db_subnet_group name, docs don't claim they are
...
allowed but they are.
2015-07-02 14:45:25 +10:00
447da2177e
Add ForceNew metadata_startup_script field
2015-07-01 21:24:34 -04:00
1e8fb65925
provider/aws: Add regression test for ELB name validation
...
- prevent #2580 from hapenning again
2015-07-01 07:29:56 +01:00
0cbb815d28
providers/aws: aws_elb: Allow alnum plus hyphen in name attribute
2015-07-01 09:16:32 +03:00
ca8736d29f
Merge branch 'master' of github.com:reverbdotcom/terraform into adding-rds-snapshots
...
* 'master' of github.com:reverbdotcom/terraform: (524 commits)
docs: tweaks to RELEASING
Minor change to docs
Update CHANGELOG.md
Update DynamoDB example docs to remove non-key attributes; update test to remove non-key attribute from attribute set to prevent infinite planning loops
Update CHANGELOG.md
use /usr/bin/env bash
provider/aws: fix go vet
provider/aws: ignore providers with Meta nil
update CHANGELOG
provider/aws: Code cleanups for Spot Requests
provider/aws: fix db_subnet acc test
Fixing the tests
Fixes issue #2568
Update CHANGELOG.md
Update CHANGELOG.md
fixes typo
Fixed void Azure network config bug.
provider/aws: ecs task definition is deregistered correctly
provider/azure: fixup storage service test
provider/docker: [tests] change images
...
2015-06-30 15:26:23 -05:00
0d58b94636
Merge pull request #2576 from johnewart/dynamodb_docs
...
[dynamodb] Update docs and fix the acceptance test accordingly
2015-06-30 14:03:08 -05:00
97ee42663b
Merge pull request #2533 from hashicorp/b-vpn-connection-protection
...
provider/aws: nil protection against VPN connections [GH-2144]
2015-06-30 13:40:47 -05:00
ca7fe86c67
Update DynamoDB example docs to remove non-key attributes; update test to remove non-key attribute from attribute set to prevent infinite planning loops
2015-06-30 11:38:16 -07:00
ece4430188
Merge pull request #2562 from aznashwan/b-azure-non-existent-netconfig
...
Fixed void Azure network config bug.
2015-06-30 13:25:43 -05:00
0698b865e2
provider/aws: fix go vet
2015-06-30 12:35:54 -05:00
0b3d249727
provider/aws: ignore providers with Meta nil
...
We changed the way validation works for providers so that they aren't
always configured if they have computed attributes. The result is that
sometimes the Configure won't be called, hence Meta is nil
2015-06-30 10:24:53 -07:00
4f2f9546c3
Merge pull request #2574 from hashicorp/b-aws-spot-request-touchup
...
provider/aws: Code cleanups for Spot Requests
2015-06-30 09:30:26 -05:00
c81345f535
provider/aws: Code cleanups for Spot Requests
2015-06-30 09:28:14 -05:00
8fa96d2c33
provider/aws: fix db_subnet acc test
...
AWS accepts uppercase DB Subnet Group names - it just automatically
downcases them. We already had logic to handle that - so we
intentionally had an acctest with uppercase characters that was now
failing.
Loosening the regexp to allow uppercase letters for now - we can discuss
if we want to tighten the validation as a separate question.
/cc @radeksimko @catsby
2015-06-30 09:20:52 -05:00
57980349fc
Merge pull request #2570 from svanharmelen/b-provisioner-chef-version
...
provisioner/chef: fixes issue #2568
2015-06-30 14:35:04 +02:00
676d490d40
provider/aws: Allow elb name to be generated
2015-06-30 13:13:51 +01:00
3d03f4b2aa
Fixing the tests
2015-06-30 14:13:36 +02:00
b7e981c6d1
Fixes issue #2568
...
When surrounding the version with quotes, even no version (an empty
string) will be accepted as parameter. The install.sh script treats an
empty version string the same as no when version is set. So it will
then just use the latest available version.
2015-06-30 14:03:06 +02:00
8acc55ae13
Merge pull request #2402 from hashicorp/f-aws-ecs-td-deregistration
...
provider/aws: Deregister ECS task definition correctly
2015-06-30 12:36:58 +01:00
f67410db53
Merge pull request #2534 from dtan4/ec-subnet-group-subnet-ids
...
Make elasticache_subnet_group subnet_ids as required argument
2015-06-30 08:45:48 +01:00
5ff6598e65
Fixed void Azure network config bug.
2015-06-30 02:13:34 +03:00
f5eb581425
provider/aws: ecs task definition is deregistered correctly
2015-06-29 23:37:20 +01:00
860a0fcbf2
provider/azure: fixup storage service test
...
wrong region in fixture vs assertion
2015-06-29 16:55:26 -05:00
4981d7d28c
provider/docker: [tests] change images
...
use a base image with a long running process - fixes container tests
2015-06-29 16:09:05 -05:00
406967e581
Merge pull request #2552 from TimeIncOSS/f-aws-iam-role-validation
...
provider/aws: Add validation for aws_iam_role_policy.name
2015-06-29 20:39:52 +01:00
ce831e879f
Merge pull request #2553 from TimeIncOSS/f-aws-iam-instance-profile-validation
...
provider/aws: Add validation for aws_iam_instance_profile.name
2015-06-29 20:39:39 +01:00
b26df75b50
Merge pull request #2327 from jefferai/f-delay-on-link
...
Fix two serious problems when using links in Docker containers
2015-06-29 14:36:38 -05:00
791787047f
Merge pull request #2395 from GrayCoder/master
...
Add resource "aws_iam_policy_attachment" to attach a managed policy to users, roles, or groups
2015-06-29 14:33:34 -05:00
ddc266902b
tests: test name consistency
2015-06-29 14:06:55 -05:00
7429027a8c
Added SQL Database Server Firewall Rule resource.
2015-06-29 21:36:02 +03:00
686076526b
Merge pull request #2543 from hashicorp/b-elastic-ip-destroy
...
provider/aws: ignore association not exist on EIP destroy [GH-2295]
2015-06-29 10:35:20 -07:00
4b5b6b6942
Merge pull request #2544 from hashicorp/b-vpc-peer-failed
...
providers/aws: vpc peering failed == deleted [GH-2322]
2015-06-29 10:35:15 -07:00
b257efa51a
Merge pull request #2545 from hashicorp/b-cloudflare-not-found
...
providers/cloudflare: if resource no longer exists, set ID to ""
2015-06-29 10:35:08 -07:00
9100ad57f6
Merge pull request #2546 from hashicorp/b-dme-not-found
...
providers/dme: unable to find record, set ID to "" [GH-2440]
2015-06-29 10:34:43 -07:00
63466121f4
Merge pull request #2532 from hashicorp/b-vpc-retry
...
provider/aws: vpc delete retry on dependency violation [GH-1628]
2015-06-29 10:23:34 -07:00
9c9fe38fd8
Merge pull request #2531 from hashicorp/b-aws-instance-refresh
...
providers/aws: set AMI on read for instance [GH-1571]
2015-06-29 10:21:30 -07:00
be8d0dea2d
provider/aws: Add validation for aws_iam_instance_profile.name
2015-06-29 16:27:35 +01:00
fed64b4fbd
provider/aws: Add validation for aws_iam_role_policy.name
2015-06-29 16:23:42 +01:00
7bb2a26b5e
providers/dme: unable to find record, set ID to "" [GH-2440]
2015-06-28 23:31:44 -07:00
05bc835748
providers/cloudflare: if resource no longer exists, set ID to ""
...
[GH-301]
2015-06-28 23:28:12 -07:00
da1cac623d
providers/aws: implement basic fast-path for not being in EC2 for creds
2015-06-28 23:06:49 -07:00
93cedc7ec1
providers/aws: style nitpick
2015-06-28 22:46:49 -07:00
2a5ed6c847
Merge pull request #1841 from josharian/aws-external-creds
...
providers/aws: detect credentials more robustly
2015-06-28 22:43:56 -07:00
e2e8d3746f
providers/aws: vpc peering failed == deleted [GH-2322]
2015-06-28 22:35:02 -07:00
cc2a5ab18f
provider/aws: ignore association not exist on EIP destroy [GH-2295]
2015-06-28 22:30:43 -07:00
28506c3750
add composeErrors function to only expose errors that happened
2015-06-28 22:30:54 -04:00
0f5c9c012d
check length of slices instead of using incorrect type
2015-06-28 20:00:55 -04:00
c375a72f15
check for empty string instead of nil
2015-06-28 19:39:50 -04:00
562cf596dc
Make elasticache_subnet_group subnet_ids essential
2015-06-28 16:13:25 +09:00
1cc5068b8c
provider/aws: nil protection against VPN connections [GH-2144]
2015-06-26 21:22:08 -07:00
ad408d8862
provider/aws: vpc delete retry on dependency violation [GH-1628]
2015-06-26 17:26:06 -07:00
f6b9e7c1a6
providers/aws: set AMI on read for instance [GH-1571]
2015-06-26 17:12:20 -07:00
5938a0806f
provider/aws: Read Route 53 after create, to populate computed values
2015-06-26 15:11:29 -05:00
079e4505a8
Merge pull request #2276 from SamClinckspoor/resource-aws-elasticache-parameter-group
...
provider/aws elasticache parameter group
2015-06-26 14:01:19 -05:00
c92b7a980c
fixed possibly incorrectly returning destroyed
2015-06-26 20:16:21 +02:00
594f04e064
Merge pull request #2523 from TimeIncOSS/aws-fix-elb-validation
...
aws: Fix validation for aws_elb.name
2015-06-26 18:25:30 +01:00
60a7597a4c
aws: Fix validation for aws_elb.name
2015-06-26 18:08:13 +01:00
2a9293a036
aws: Fix validation for aws_db_instance.identifier
2015-06-26 17:57:13 +01:00
9528ff1e0a
Merge pull request #2519 from TimeIncOSS/f-aws-lc-validation
...
provider/aws: Add validation for aws_launch_configuration
2015-06-26 15:53:22 +01:00
685ca374dc
Merge pull request #2520 from TimeIncOSS/f-aws-asg-validation
...
provider/aws: Add validation for aws_autoscaling_group.name
2015-06-26 15:53:14 +01:00
a91db09efe
provider/aws: Add validation for aws_iam_role.name
2015-06-26 15:44:56 +01:00
23459ec840
provider/aws: Add validation for aws_autoscaling_group.name
2015-06-26 15:43:06 +01:00
36fee9a2f5
provider/aws: Add validation for aws_launch_configuration
2015-06-26 15:40:28 +01:00
7217a37696
Merge pull request #2517 from TimeIncOSS/f-aws-elb-validation
...
provider/aws: Add validation for aws_elb.name
2015-06-26 15:33:18 +01:00
4230a524a4
Merge pull request #2516 from TimeIncOSS/f-aws-db-instance-id-validation
...
provider/aws: Add validation for aws_db_instance.identifier
2015-06-26 15:30:08 +01:00
c928d2803c
Merge pull request #2497 from rgl/master
...
provider/digitalocean: check if the droplet no longer exists.
2015-06-26 09:29:07 -05:00
ea7395ffe7
Merge pull request #2518 from TimeIncOSS/f-aws-sg-validation
...
provider/aws: Add validation for aws_security_group (name+description)
2015-06-26 15:25:15 +01:00
ad0bfd9cfb
Merge pull request #2321 from dpaq/f-add-additonal-protocol-integers-for-acls-and-security-groups
...
provider/aws: add ah and esp protocol integers for network acls and sg
2015-06-26 09:19:07 -05:00
4525119a57
provider/aws: Add validation for aws_security_group (name+description)
2015-06-26 15:10:04 +01:00
6f2fb0db38
provider/aws: Add validation for aws_elb.name
2015-06-26 15:08:00 +01:00
3a9852568a
provider/aws: Add validation for aws_db_instance.identifier
2015-06-26 15:06:36 +01:00
d82d803690
Merge pull request #2510 from CpuID/cpuid_gh2509
...
default_cooldown change shouldnt force new resource
2015-06-26 08:55:36 -05:00
db11d80947
Merge pull request #2515 from aznashwan/f-azure-instance-services
...
provider/azure: Made instances deployable on already existing services.
2015-06-26 08:54:57 -05:00
4a14d83733
Merge pull request #2513 from TimeIncOSS/f-aws-validation-db-subnet-group
...
aws: Add validation for aws_db_subnet_group.name
2015-06-26 08:46:39 -05:00
6ea0397e07
Made instances deployable on already existing services.
2015-06-26 15:49:05 +03:00
f424085f44
provider/aws: Add validation for aws_vpc.cidr_block
...
- closes #2340
2015-06-26 12:44:26 +01:00
ca83dc2118
provider/aws: Add validation for aws_db_subnet_group.name
2015-06-26 12:39:55 +01:00
765be4c768
provider/aws: Fix naming in validation of db_instance.final_snapshot_identifier
2015-06-26 12:10:26 +01:00
4a791c1b41
default_cooldown change shouldnt force new resource - https://github.com/hashicorp/terraform/issues/2509 - credit to
...
@phinze and @mzupan for https://github.com/hashicorp/terraform/pull/2147
2015-06-26 15:51:31 +10:00
02791d70df
provider/digitalocean: check if the droplet no longer exists.
2015-06-25 22:17:56 +01:00
1e08c6e72f
Made Azure security group rules - security groups relationship one - many.
2015-06-25 21:57:38 +03:00
de5df6f378
Merge pull request #2462 from johnewart/dynamodb_throttle
...
dynamodb - Support backing off a bit when throttling / limit-exceeded exceptions happen
2015-06-25 12:29:09 -05:00
2e23210e58
poll ElastiCache cluster status on update
2015-06-25 11:10:02 -05:00
93a577880b
provider/aws: Allow in-place updates for ElastiCache cluster
2015-06-25 11:09:29 -05:00
25fa84974b
update CHANGELOG
2015-06-25 09:07:11 -07:00
02624118b3
Merge pull request #2489 from joshgarnett/aws_instance_monitoring
...
provider/aws: adding support for detailed monitoring of instances
2015-06-25 09:05:15 -07:00
ecbd5a5013
Merge pull request #2455 from semarj/master
...
dynamodb - only require nonkey attributes on INCLUDE
2015-06-25 09:03:44 -07:00
edbc578316
As discussed on the issue, remove the hard-coded delay on startup in
...
favor of attempting to detect if the initial container ever enters
running state, and erroring out if not. It will re-check the container
once every 500ms for 15 seconds total; future work could make that
configurable.
2015-06-25 15:11:00 +00:00
d23f534d26
Adding support for detailed monitoring of instances
2015-06-25 10:58:28 -04:00
56cfba2509
Fix a serious problem when using links.
...
Links cause there to be more than one name for a container to be
returned. As a result, only looking at the first element of the
container names could cause a container to not be found, leading
Terraform to remove it from state and attempt to recreate it.
2015-06-25 14:40:03 +00:00
2e01e0635b
When linking to other containers, introduce a slight delay; this lets
...
the Docker API get those containers running. Otherwise when
you try to start a container linking to them, the start command
will fail, leading to an error.
2015-06-25 14:40:03 +00:00
61517f68b1
Add an `ohai_hints` option to upload hint files
...
This option takes a list of hints that will be uploaded to the new node
before starting the initial Chef run.
2015-06-25 16:32:36 +02:00
7e05b083d3
include keys only projection type
2015-06-25 09:30:44 -05:00
4c66df0dbf
Merge pull request #2483 from svanharmelen/f-provisioner-chef-ostype
...
provisioner/chef: add an option to specifically specify the target OS
2015-06-25 16:14:23 +02:00
7a15090208
Merge pull request #2472 from hashicorp/f-aws-asg-update-elbs
...
provider/aws: Update ASGs to support in-place updates for Load Balancers
2015-06-25 08:55:46 -05:00
2690d87d39
Add an option to specifically specify the target OS
...
Before this option (`os_type`) the provisioner would use the connection
type to determine the targeted OS. When not supplying a value for
`os_type`, it will fall back to the old behaviour, so this is full BC.
2015-06-25 14:29:48 +02:00
46fed750a5
simple acc test covering more projection types
2015-06-25 03:38:17 -05:00
b7b770d0da
Update user date size check
...
This makes sure we check the right thing.
2015-06-25 09:45:39 +02:00
0d36c24c54
Merge pull request #2391 from chiradeep/master
...
increase allowed size of userdata for cloudstack provider
2015-06-25 09:39:04 +02:00
ebc33d874a
providers/openstack: fix vet issue
2015-06-24 23:16:06 -07:00
ede6af8763
Merge pull request #1921 from jtopjian/openstack-servergroup-schedulerhints
...
provider/openstack: scheduler_hints and servergroups
2015-06-24 23:13:25 -07:00
d1d2a90158
Revert "provider/openstack: change security groups to set"
...
This reverts commit 646fd76e07
2015-06-24 23:10:30 -07:00
38151229b1
Merge pull request #2285 from cvvs/b_provider_openstack_router_adminbool
...
provider/openstack: change router resource admin_state_up from string to bool
2015-06-24 23:09:14 -07:00
dc26f06b5f
Merge pull request #2410 from TimeIncOSS/f-aws-lc-monitoring
...
provider/aws: Add aws_launch_configuration.enable_monitoring
2015-06-25 07:02:56 +01:00
a4070a1972
Merge pull request #2452 from zollie/f-aws-launch-configuration-profile-propagation-wait
...
provider/aws: Add retry to aws_launch_configuration Create to wait for IAM instance profile propagation
2015-06-24 22:59:42 -07:00
6e818785af
provider/aws: Update ASGs to support in-place updates for Load Balancers
2015-06-24 16:37:23 -05:00
579b33b8a2
Retry aws_launch_configuration Create on 'Invalid IamInstanceProfile' error only
2015-06-24 17:11:46 -04:00
6fdbca8e58
Merge pull request #2466 from TimeIncOSS/f-schema-field-name-validate
...
schema: Add field name to ValidateFunc
2015-06-24 18:52:53 +01:00
9fc78d4ea1
Merge pull request #2448 from hashicorp/b-openstack-networks
...
providers/openstack: fix crash case if network is nil [GH-2323]
2015-06-24 10:38:27 -07:00
232916a4de
Merge pull request #2449 from hashicorp/b-aws-sg-crash
...
providers/aws: more guards against crashy cases [GH-2308]
2015-06-24 10:35:04 -07:00
92db4802b6
schema: Add field name to ValidateFunc
2015-06-24 18:22:12 +01:00
fd98cae9cc
Increment attemptCount when a LimitExceededException occurs
2015-06-24 07:36:14 -07:00
7718cd194c
Support backing off a bit when throttling / limit-exceeded exceptions happen
2015-06-24 07:25:00 -07:00
fef5741ded
providers/aws: fix another crash case
2015-06-23 22:48:39 -07:00
cddd54c3de
fmt
2015-06-23 22:31:24 -07:00
7948aa720e
dynamodb - only require nonkey attributes on INCLUDE
2015-06-23 23:50:29 -05:00
079a26a655
Wrapped Create in a resource.Retry to wait for IAM instance profile propagation
2015-06-23 22:14:53 -04:00
b0169adf02
providers/aws: more guards against crashy cases [GH-2308]
2015-06-23 16:23:24 -07:00
09acd1f79d
providers/openstack: fix crash case if network is nil [GH-2323]
2015-06-23 16:19:42 -07:00
5cf5451d28
Merge pull request #1999 from TimeIncOSS/r53-delegation-set
...
provider/aws: Add Route 53 delegation set resource
2015-06-23 22:51:47 +01:00
24c4c55511
Merge pull request #2384 from hashicorp/f-aws-flow-logs
...
provider/aws: Add FlowLog resource
2015-06-23 15:08:00 -05:00
7d26e1408a
Merge pull request #2434 from hashicorp/b-sg-rule-crash
...
provider/aws: fix sg rule crash
2015-06-23 15:01:35 -05:00
95235ba2cc
Merge pull request #2374 from hashicorp/b-aws-detect-instance-type-drift
...
provider/aws: detect instance_type drift on aws_instance
2015-06-23 15:01:20 -05:00
e0fccf2dcc
provider/aws: fix sg rule crash
...
Fixes crash in #2431
Decided that `findResourceSecurityGroup` should return an error when
the SG is not found, since the callers cannot happily continue with a
`nil` SG
Also passes through a few error cases that were being swallowed.
/cc @catsby
2015-06-23 09:25:55 -05:00
020dc03234
provider/aws: fix root_block_device for odd AMIs
...
Some AMIs have a RootDeviceName like "/dev/sda1" that does not appear as a
DeviceName in the BlockDeviceMapping list (which will instead have
something like "/dev/sda")
While this seems like it breaks an invariant of AMIs, it ends up working
on the AWS side, and AMIs like this are common enough that we need to
special case it so Terraform does the right thing.
Our heuristic is: if the RootDeviceName does not appear in the
BlockDeviceMapping, assume that the DeviceName of the first
BlockDeviceMapping entry serves as the root device.
fixes #2224
2015-06-23 09:01:41 -05:00
cde64727f3
Merge pull request #2411 from Jberlinsky/master
...
Improve idempotency of aws_iam_server_certificate provisioning
2015-06-22 18:12:49 -05:00
aa8cf572a8
Merge pull request #2265 from hashicorp/f-schema-validate-field
...
Support arbitrary per-field schema validation
2015-06-22 18:01:54 -05:00
cc43ae8c4b
Merge branch 'master' into f-aws-flow-logs
...
* master:
Update CHANGELOG.md
Update CHANGELOG.md
Added affinity group resource.
update link to actually work
provider/azure: Fix SQL client name to match upstream
add warning message to explain scenario of conflicting rules
typo
remove debugging
Update CHANGELOG.md
provider/aws: Add docs for autoscaling_policy + cloudwatch_metric_alarm
provider/aws: Add autoscaling_policy
provider/aws: Add cloudwatch_metric_alarm
rename method, update docs
clean up some conflicts with
clean up old, incompatible test
update tests with another example
update test
remove meta usage, stub test
fix existing tests
Consider security groups with source security groups when hashing
2015-06-22 09:33:42 -05:00
87c7f6337d
remove flow/deliver log status attributes
2015-06-22 09:31:37 -05:00
06e2336467
Replace AWS IAM test SSL certificate with self-signed cert, including CA chain
2015-06-21 01:40:29 -04:00
a7b31ac40d
Normalize certificate chains as well as certificate bodies when creating AWS IAM SSL certificates
2015-06-21 01:40:09 -04:00
cbddab8a69
provider/aws: Add aws_launch_configuration.enable_monitoring
2015-06-20 23:40:29 +01:00
9b5c99ba28
Added affinity group resource.
2015-06-19 21:53:36 +03:00
44eb55f8f6
update link to actually work
2015-06-19 11:50:10 -05:00
d2176b2d7e
Merge branch 'master' into jszwedko-fix-sg
...
* master:
provider/azure: Fix SQL client name to match upstream
2015-06-19 11:40:50 -05:00
2410824fc9
provider/azure: Fix SQL client name to match upstream
...
name was changed in 4f4636621e
2015-06-19 11:39:50 -05:00
a3cbb74a2e
Merge branch 'master' into jszwedko-fix-sg
...
* master: (23 commits)
typo
Update CHANGELOG.md
provider/aws: Add docs for autoscaling_policy + cloudwatch_metric_alarm
provider/aws: Add autoscaling_policy
provider/aws: Add cloudwatch_metric_alarm
Update CHANGELOG.md
Update CHANGELOG.md
provider/template: don't error when rendering fails in Exists
Update CHANGELOG.md
Added Azure SQL server and service support.
Update CHANGELOG.md
docs: clarify wording around destroy/apply args
Getting Started: Added a Next Step upon finishing install.
docs: add description of archive format to download page
docs: snapshot plugin dependencies when releasing
add v0.5.3 transitory deps
Fixes support for changing just the read / write capacity of a GSI
Change sleep time for DynamoDB table waits from 3 seconds to 5 seconds
Remove request for attribute changes
Fix AWS SDK imports
...
2015-06-19 11:31:41 -05:00
645a5aa55b
add warning message to explain scenario of conflicting rules
2015-06-19 11:23:59 -05:00
611741c108
typo
2015-06-18 15:47:54 -05:00
f8d190f537
fix compile error not caught by 'make dev'
2015-06-18 10:45:15 -07:00
24e2cfb260
test works
2015-06-18 11:10:14 -04:00
3266c44b83
rename to more intuitive name and finish tests
2015-06-18 10:53:52 -04:00
24ee2e5d53
remove debugging
2015-06-18 08:39:08 -05:00
0bf127a805
update test; fix import, interpolate ENV var for log name
2015-06-18 08:35:45 -05:00
285a88b664
code cleanups
2015-06-18 08:28:38 -05:00
139500e076
increase allowed size of userdata for cloudstack provider
2015-06-17 15:41:25 -07:00
1411435179
provider/aws: Add support for delegation_set to route53_hosted_zone
2015-06-17 23:24:41 +01:00
bfd8226b89
provider/aws: Add route53_delegation_set
2015-06-17 23:24:41 +01:00
14f4e5fe54
provider/aws: Add docs for autoscaling_policy + cloudwatch_metric_alarm
2015-06-17 23:10:23 +01:00
05f4b9bfd9
provider/aws: Add autoscaling_policy
2015-06-17 23:10:23 +01:00
ceeb94e157
provider/aws: Add cloudwatch_metric_alarm
2015-06-17 23:10:23 +01:00
b3d7bb2b39
fix go vet error
2015-06-17 16:45:14 -05:00
1a6aef0ed7
Log Group Name is required/forcenew
2015-06-17 16:33:24 -05:00
bfdf11c477
provider/aws: Implement AWS Flow Logs
2015-06-17 16:31:21 -05:00
5e86e709bc
Merge pull request #2386 from hashicorp/b-template-variable-change-failure
...
provider/template: don't error when rendering fails in Exists
2015-06-17 15:36:11 -05:00
385b17d679
provider/template: don't error when rendering fails in Exists
...
The Exists function can run in a context where the contents of the
template have changed, but it uses the old set of variables from the
state. This means that when the set of variables changes, rendering will
fail in Exists. This was returning an error, but really it just needs to
be treated as a scenario where the template needs re-rendering.
fixes #2344 and possibly a few other template issues floating around
2015-06-17 15:33:07 -05:00
7bf27daa64
seems to work
2015-06-17 15:21:41 -04:00
357ed8e774
Added Azure SQL server and service support.
2015-06-17 21:23:16 +03:00
2135ff02b7
add works but need tests
2015-06-17 10:56:33 -04:00
b132dd284e
Merge pull request #2121 from johnewart/dynamodb
...
DynamoDB Support
2015-06-17 09:47:13 -05:00
640836ee58
rename method, update docs
2015-06-17 09:35:50 -05:00
359826be26
clean up some conflicts with
2015-06-16 16:38:26 -05:00
c1cdac1f76
clean up old, incompatible test
2015-06-16 16:30:33 -05:00
3bf89fb81e
update tests with another example
2015-06-16 16:21:46 -05:00
Radek Simko