Pradeep Bhadani
d316205cf5
Remove extra line
2017-05-19 08:05:18 +00:00
Jake Champlin
fcdf494cff
Merge pull request #14646 from hashicorp/f-update-route-table-docs-note
...
docs/aws: add note for aws_route_table resource
2017-05-18 17:29:32 -04:00
Jake Champlin
b38210c597
docs/aws: add note for aws_route_table resource
2017-05-18 17:12:11 -04:00
Matt Robenolt
27927ddc2c
provider/google: Add support for privateIpGoogleAccess on subnetworks ( #14234 )
2017-05-18 13:35:02 -07:00
clint shryock
a8c2828b63
provider/google: Update docs to match new default value
2017-05-18 15:10:52 -05:00
Paddy
e7dcf95fa1
Merge pull request #14644 from hashicorp/paddy_gcp_remove_project_services_docs
...
provider/google: remove deleted services field.
2017-05-18 12:55:20 -07:00
clint shryock
aae44290cd
merge master
2017-05-18 13:56:55 -05:00
Radek Simko
740c92fc67
provider/aws: Support filtering in ASG data source ( #14501 )
2017-05-18 17:40:49 +02:00
Pradeep Bhadani
c35d2325ef
Update pow function description
2017-05-18 15:23:12 +00:00
Jason
eac7ade310
Fixed export to be master_username from username
...
rds cluster exports the variable for "username" as master_username, not username.
2017-05-18 10:17:48 -05:00
Jake Champlin
5e7035bf89
Merge pull request #14598 from pradeepbhadani/pow
...
Add power function
2017-05-18 11:12:33 -04:00
Pradeep Bhadani
faa480894f
Add note in documentation for pow function
2017-05-18 15:03:13 +00:00
Jake Champlin
3f10116c6b
Merge pull request #14563 from raphink/rancher_member
...
rancher_environment: add member support
2017-05-18 09:54:40 -04:00
Raphaël Pinson
d0e5ee0a27
rancher_environment: member documentation details
2017-05-18 15:22:48 +02:00
Eugene Chuvyrov
5884d518e7
[MS] Adding support for VMSS Data Disks using Managed Disk feature ( #14608 )
...
* Added support for data disks with managed disks feature
* Updated docs with VMSS Data Disks changes
2017-05-18 14:30:19 +03:00
Yorgos Saslis
5efe3ad6b3
Update supported AWS regions ( #14621 )
...
According to an AWS announcement from yesterday:
https://aws.amazon.com/about-aws/whats-new/2017/05/amazon-lightsail-now-available-in-5-additional-europe-us-aws-regions/
2017-05-18 14:10:37 +03:00
mosuke5
19d3355ca6
Update Example Usage ( #14606 )
...
Delete an unnecessary option `commodity_code `.
2017-05-18 13:00:15 +03:00
Paddy
51dd79fdf1
provider/google: remove deleted services field.
...
We removed the services field from the `google_project` resource, but it
lingered in the docs. This removes those out of date references to it.
2017-05-17 23:24:42 -07:00
Pradeep Bhadani
47b1aaea3a
Add pow function
2017-05-17 21:46:33 +00:00
Caio Filipini
a565001014
provider/digitalocean: Add documentation for Certificate resource
2017-05-17 21:20:25 +02:00
Jake Champlin
8df29ccde6
Merge pull request #14580 from pradeepbhadani/master
...
Mention timezone in preferred_backup_window description and Update rds_cluster_instance supported list
2017-05-17 14:47:07 -04:00
Dana Hoffman
c5b1eed7e5
Add mechanism for listing services in project_services docs ( #14557 )
2017-05-17 20:41:45 +03:00
Jeremy Voorhis
b0ad1b9669
Archive provider docs ( #14584 )
...
* Document source block for archive_file data source.
* Add example for archive_file source block.
* Capitalize Optional/Required for consistency with majority of provider docs.
2017-05-17 20:41:25 +03:00
pradeepbhadani
2cc7431983
Update supported instance list
...
db.t2.small is in list of AWS documentation https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html
2017-05-17 17:20:44 +01:00
pradeepbhadani
8f5e5c47b9
Update preferred_backup_window description
...
mention time in UTC
2017-05-17 17:15:00 +01:00
Raphaël Pinson
fc0d197be8
Add github_user data source
2017-05-17 15:04:25 +02:00
Radek Simko
65d47774f2
provider/kubernetes: Add support for Service ( #14554 )
2017-05-17 14:43:53 +02:00
Jake Champlin
da2659b8e9
Merge pull request #11710 from ewbankkit/aws_default_vpc-resource
...
resource/aws: Add 'aws_default_vpc' resource
2017-05-17 08:37:14 -04:00
Stephen Weatherford
bd468170e4
[MS] Note ForceNew in VMSS docs where missing ( #14560 )
...
* Add single_placement_group to VMSS
* Add test, plus fixes
* Fix tests
* Add ForceNew to VMSS docs where missing
2017-05-17 10:15:34 +01:00
Raphaël Pinson
01e9011231
rancher_environment: member doc
2017-05-17 10:30:16 +02:00
Kit Ewbank
2ed7297fa3
Add 'aws_default_vpc' resource.
2017-05-16 20:15:40 -04:00
Jake Champlin
e2a37c1a51
Merge pull request #14544 from hashicorp/b-opc-ip-reservation-default
...
provider/opc: Update docs for `parent_pool` to an Optional attribute
2017-05-16 15:27:01 -04:00
Jake Champlin
9892816336
provider/opc: add missing documentation back from opc provider
2017-05-16 13:23:24 -04:00
Jake Champlin
d7d9588175
provider/opc: Document changes for ip reservation
...
Documentation changes for https://github.com/hashicorp/terraform-provider-opc/pull/2
2017-05-16 13:19:02 -04:00
Miguel Espinoza
90d5bb8be3
Update usage.html.markdown ( #14384 )
2017-05-16 20:08:21 +03:00
Paul Stack
055c18e302
core/provider-split: Split out the Oracle OPC provider to new structure ( #14362 )
...
* core/providersplit: Split OPC Provider to separate repo
As we march towards Terraform 0.10.0, we are going to start building the
terraform providers as separate binaries - this will allow us to
continually release them. Before we go to 0.10.0, we need to be able to
continue building providers in the same manner, therefore, we have
hardcoded the path of the provider in the generate-plugins.go file
The interim solution will require us to vendor the opc provider and any
child dependencies, but when we get to 0.10.0, we will no longer have to
do this - the core will auto download the plugin binary. The plugin
package will have it's own dependencies vendored as well.
* core/providersplit: Removing the builtin version of OPC provider
* core/providersplit: Vendoring the OPC plugin
* core/providersplit: update internal plugin list
* core/providersplit: remove unused govendor item
2017-05-16 19:53:25 +03:00
Jake Champlin
e4a50f2bae
Merge pull request #14543 from hashicorp/b-opc-ip-addr-res
...
provider/opc: Correctly export `ip_address` in IP Addr Reservation
2017-05-16 10:43:13 -04:00
yanndegat
21d8125d5c
provider/ovh: new provider ( #12669 )
...
* vendor: add go-ovh
* provider/ovh: new provider
* provider/ovh: Adding PublicCloud User Resource
* provider/ovh: Adding VRack Attachment Resource
* provider/ovh: Adding PublicCloud Network Resource
* provider/ovh: Adding PublicCloud Subnet Resource
* provider/ovh: Adding PublicCloud Regions Datasource
* provider/ovh: Adding PublicCloud Region Datasource
* provider/ovh: Fix Acctests using project's regions
2017-05-16 17:26:43 +03:00
Jake Champlin
bc1a6b0261
provider/opc: Correctly export `ip_address` in IP Addr Reservation
...
Correctly sets the attribute `ip_address` in the `opc_compute_ip_address_reservation` resource.
Also updates documentation for the `ip_address_pool` attribute.
```
$ make testacc TEST=./builtin/providers/opc TESTARGS="-run=TestAccOPCIPAddressReservation_Basic"
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/05/16 10:15:53 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/opc -v -run=TestAccOPCIPAddressReservation_Basic -timeout 120m
=== RUN TestAccOPCIPAddressReservation_Basic
--- PASS: TestAccOPCIPAddressReservation_Basic (22.60s)
PASS
ok github.com/hashicorp/terraform/builtin/providers/opc 22.604s
```
2017-05-16 10:19:29 -04:00
Jake Champlin
048767d591
Merge pull request #14537 from Mongey/cm-vault-auth-backend-docs
...
Add docs for vault_auth_backend
2017-05-16 09:22:15 -04:00
Jake Champlin
30c3e72dd4
Merge pull request #14540 from BWITS/aws_appautoscaling_policy
...
fix the metric bound in sample
2017-05-16 09:16:33 -04:00
Conor Mongey
74252b269f
Add docs for vault_auth_backend
2017-05-16 14:09:44 +01:00
Bill Wang
00df2f1498
fix the metric bound in sample
...
The author made this mistake at the beginning. With the original sample, you can't create `aws_appautoscaling_policy` properly. No threshold data in it. It is hard to troubleshoot this issue because there is no error to run the sample with `metric_interval_lower_bound = 0'
2017-05-16 22:58:53 +10:00
Stephen Weatherford
b65df9b5ac
[MS] 14058 single placement group tf ( #14510 )
...
* Add single_placement_group to VMSS
* Add test, plus fixes
* Fix tests
2017-05-16 11:46:07 +03:00
Kit Ewbank
36888278b5
Add 'aws_default_vpc_dhcp_options' resource. ( #14475 )
2017-05-16 11:44:23 +03:00
Kit Ewbank
534dca00b2
Add 'aws_default_subnet' resource. ( #14476 )
2017-05-16 11:40:56 +03:00
Sergiusz Urbaniak
399830f1b7
providers/aws: add tags for resource_aws_autoscaling_group ( #13574 )
...
The existing "tag" field on autoscaling groups is very limited in that it
cannot be used in conjunction with interpolation preventing from adding
dynamic tag entries.
Other AWS resources don't have this restriction on tags because they work
directly on the map type.
AWS autoscaling groups on the other hand have an additional field
"propagate_at_launch" which is not usable with a pure map type.
This fixes it by introducing an additional field called "tags" which
allows specifying a list of maps. This preserves the possibility to
declare tags as with the "tag" field but additionally allows to
construct lists of maps using interpolation syntax.
2017-05-16 10:39:41 +02:00
Paul Stack
2276e981ee
provider/aws: Add new aws_db_snapshot data source ( #10291 )
...
* provider/aws: Add ability to create AWS DB Snapshots
* provider/aws: Add AWS DB Snapshot resource acceptance tests
```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSDBSnapshot_
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2016/11/22 18:24:05 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSDBSnapshot_ -timeout 120m
=== RUN TestAccAWSDBSnapshot_basic
--- PASS: TestAccAWSDBSnapshot_basic (892.75s)
PASS
ok github.com/hashicorp/terraform/builtin/providers/aws 892.773s
```
* provider/aws: Add new aws_db_snapshot data source
* docs/aws: Add documentation for aws_db_snapshot resource
* provider/aws: Add datasource for aws_db_snapshot acceptance tests
```
% make testacc TEST=./builtin/providers/aws
% TESTARGS='-run=TestAccAWSDbSnapshotDataSource_' 2 ↵ ✭
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2016/11/22 18:55:08 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v
-run=TestAccAWSDbSnapshotDataSource_ -timeout 120m
=== RUN TestAccAWSDbSnapshotDataSource_basic
--- PASS: TestAccAWSDbSnapshotDataSource_basic (966.68s)
PASS
ok github.com/hashicorp/terraform/builtin/providers/aws966.699s
```
* docs/aws: Adding documentation for aws_db_snapshot datasource
2017-05-15 20:17:26 +03:00
Jake Champlin
5a3cf7c89e
Merge pull request #14473 from realflash/master
...
Document AWS IPv6 address access
2017-05-15 09:33:06 -04:00
Jake Champlin
ef4914e300
Merge pull request #14492 from hashicorp/f-update-dynamodb-docs
...
provider/aws: Update documentation for dynamodb
2017-05-15 08:45:08 -04:00
Patrick Decat
d27c511689
Typo: resotred => restored ( #14494 )
2017-05-15 14:35:18 +02:00
Jake Champlin
ccd001f426
provider/aws: fix documentation for dynamodb
2017-05-15 08:31:43 -04:00
Jake Champlin
c9044365bd
provider/aws: Update documentation for dynamodb
2017-05-15 08:17:49 -04:00
Aleksejs Sinicins
0e0c61bbd8
Fix typo in ignition documentation ( #14469 )
2017-05-15 13:08:24 +03:00
Joe Topjian
0d930618ad
Merge pull request #14307 from takaishi/support-to-create-seccgorup-rule-with-protocol-name
...
provider/openstack: Add to support protocols for resourceNetworkingSecGroupRuleV2
2017-05-14 22:33:30 -06:00
Ian Gibbs
a4784e4d2a
Document the data attribute that allows you to get at an instance's IPv6 address(es)
2017-05-14 21:42:18 +01:00
Jay Wang
6ca50dd81d
[MS] provider/azurerm: New resource - Express Route Circuit ( #14265 )
...
* Adds ExpressRoute circuit documentation
* Adds tests and doc improvements
* Code for basic Express Route Circuit support
* Use the built-in validation helper
* Added ignoreCaseDiffSuppressFunc to a few fields
* Added more information to docs
* Touchup
* Moving SKU properties into a set.
* Updates doc
* A bit more tweaks
* Switch to Sprintf for test string
* Updating the acceptance test name for consistency
2017-05-14 19:30:14 +01:00
r_takaishi
7ec662b243
provider/openstack: Add to support protocols for resourceNetworkingSecGroupRuleV2
2017-05-14 20:59:18 +09:00
Yusuke Goto
3b14fc90d9
provider/aws: AWS WAF Regional IPSet + ByteMatchSet support ( #13705 )
...
* provider/aws: AWS WAF Regional ByteMatchSet support
* providor/aws: AWS WAF Regional IPSet support
* fix typo
* Nested ByteMatchTuples of WAF Regional support
* fix name byte_match_tuple singular WAF Regional
* update wafregional_byte_match_set doc
* fix wafregional ipset to look descriptor
* Add wafregional_byte_match_set test
* fix wafregional_ipset_descriptor to be singular
* fix newWafRegionalRetryer to receive region
* fix updateSetWR argument
* fix wafregional_ipset_descriptor doc
* Separate out logic into flatteners
* Fix failing test
2017-05-13 22:01:27 +02:00
Roman Laguta
cb590e516d
Added new evaluation_delay parameter ( #14433 )
...
* Added new evaluation_delay field
Added new evaluation_delay parameter to pass it through the datadog monitor api
* Changed tests for new evaluation_delay field
* changed documentation
2017-05-12 16:12:21 +03:00
Sertaç Özercan
e0cd380814
[MS] provider/azurerm: Virtual Machine Scale Sets with managed disk support ( #13717 )
...
* added vmss with managed disk support
* Update vmss docs
* update vmss test
* added vmss managed disk import test
* update vmss tests
* remove unused test resources
* reverting breaking changes on storage_os_disk and storage_image_reference
* updated vmss tests and documentation
* updated vmss flatten osdisk
* updated vmss resource and import test
* update name in vmss osdisk
* update vmss test to include a blank name
* update vmss test to include a blank name
2017-05-12 15:58:00 +03:00
Joe Topjian
a27e142625
provider/openstack: Add documentation about user_data ( #14411 )
2017-05-12 13:36:01 +03:00
PaulAtkins
deda15ace0
Correct argument description for targets ( #14428 )
...
Correct `targets` argument description to show the allowed keys are `InstanceIds` or `WindowTargetIds`
2017-05-12 13:32:11 +03:00
Andy Chan
5449e7731f
Adding the missed Timeout related documentation ( #14410 )
2017-05-11 22:37:54 +03:00
Radek Simko
68aebee1e5
provider/aws: Fix Content-Encoding for S3 object acc test ( #14400 )
2017-05-11 18:35:50 +02:00
vrenjith
fae2bf98e6
Spaces are not allowed in name
...
Spaces are not allowed in name for `azurerm_lb_probe`
2017-05-11 20:48:11 +05:30
Daniel Schierbeck
e252640a94
Add a `url` attribute to `google_storage_bucket` ( #14393 )
...
* Add a `url` attribute to `google_storage_bucket`
* Document the `url` attribute
2017-05-11 15:30:06 +03:00
stack72
6063898e06
Merge branch 'master' of github.com:hashicorp/terraform
2017-05-11 14:56:01 +03:00
stack72
dc00c6bc09
provider/aws: Add AWS devicefarm docs to AWS navbar
2017-05-11 14:53:49 +03:00
stack72
4942c4d44d
Merge branch 'feat/device-farm-integration' of https://github.com/DanielMSchmidt/terraform into DanielMSchmidt-feat/device-farm-integration
2017-05-11 14:39:30 +03:00
Gerben Jacobs
2178981b44
update docs for `rundeck_job` resource
...
Change-Id: Id40ae356eaaedf9656b7e38d96d8eb292c9d2cea
2017-05-11 14:30:21 +03:00
tombuildsstuff
21af9995e9
Fixing some broken links
2017-05-11 13:55:29 +03:00
vrenjith
c3db6d02d7
Update for storage_os_disk description ( #14376 )
...
Changed data to os in the storage_os_disk description
2017-05-11 11:10:09 +01:00
Paddy
25ed7cc6c0
Merge pull request #14280 from hashicorp/paddy_container_versions
...
providers/google: add google_container_versions data source.
2017-05-10 15:50:16 -07:00
Paddy
de93082375
More doc updates container => container engine.
2017-05-10 15:41:02 -07:00
Paddy
1709ea4414
google_container_versions => google_container_engine_versions
...
As per feedback from @danawillow and @radeksimko.
2017-05-10 15:01:15 -07:00
Clint
24e00af217
provider/aws: Force lowercasing for DB Option group name or name_prefix ( #14366 )
2017-05-10 15:42:10 -05:00
Alexander
9517d80a35
provider/google: BigQuery Table ( #13743 )
...
* Add resource
* Add tests
* Add documentation
* Fix invalid comment
* Remove MinItems
* Add newline
* Store expected ID and format
* Add import note
* expiration_time can be computed if dataset has an expiration_time set
* Handle 404 using new check function
2017-05-10 10:20:39 -07:00
clint shryock
3063fa9947
provider/aws: Update documentation example to meet validation
2017-05-10 09:00:14 -05:00
Stephen Coe
c83ee17590
correction for capability values ( #14349 )
2017-05-10 14:44:13 +02:00
liz abinante!
35fc047b69
Merge pull request #14228 from hashicorp/liz/vagrant-cloud-migration-docs
...
website: copy vagrant cloud docs
2017-05-09 11:34:24 -07:00
Paul Stack
c4aaddde1a
provider/aws: Update aws_elasticache_replication_group documentation
2017-05-09 20:37:28 +03:00
Derrick Petzold
55a4ce2838
Feature request: Support for ElastiCache Redis cluster mode #9419
...
Added support for provisioning a native redis cluster elasticache replication group.
A new TypeSet attribute `cluster_mode` has been added. It requires the following
fields:
- `replicas_per_node_group` - The number of replica nodes in each node group
- `num_node_groups` - The number of node groups for this Redis replication group
Notes:
- `automatic_failover_enabled` must be set to true.
- `number_cache_clusters` is now a optional and computed field. If `cluster_mode` is set
its value will be computed as:
```num_node_groups + num_node_groups * replicas_per_node_group```
Below is a sample config:
resource "aws_elasticache_replication_group" "bar" {
replication_group_id = "tf-redis-cluser"
replication_group_description = "test description"
node_type = "cache.t2.micro"
port = 6379
parameter_group_name = "default.redis3.2.cluster.on"
automatic_failover_enabled = true
cluster_mode {
replicas_per_node_group = 1
num_node_groups = 2
}
}
2017-05-09 20:37:28 +03:00
liz abinante
de3e6ad416
⚡ website: copy vagrant cloud docs
2017-05-09 10:24:56 -07:00
Paul Stack
9dd4e5bcb0
provider/aws: Add support for targets to aws_ssm_association ( #14246 )
...
* provider/aws: Add support for targets to aws_ssm_association
Fixes : #13975
```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSSSMAssociation_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/05/05 20:32:43 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSSSMAssociation_ -timeout 120m
=== RUN TestAccAWSSSMAssociation_basic
--- PASS: TestAccAWSSSMAssociation_basic (139.13s)
=== RUN TestAccAWSSSMAssociation_withTargets
--- PASS: TestAccAWSSSMAssociation_withTargets (33.19s)
PASS
ok github.com/hashicorp/terraform/builtin/providers/aws 172.343s
```
* Update ssm_association.html.markdown
2017-05-09 17:48:57 +03:00
Dana Hoffman
1438eacdad
provider/google: better visibility for compute_region_backend_service ( #14301 )
2017-05-09 13:10:14 +03:00
stack72
880071ded5
Merge branch 'ses-arn' of https://github.com/joshuaspence/terraform into joshuaspence-ses-arn
2017-05-09 13:04:27 +03:00
Daniel Schmidt
6a7e81d8ae
provider/aws: add devicefarm project resource
2017-05-09 09:48:44 +02:00
Joshua Spence
f488e385f2
Add `arn` attribute to `aws_ses_domain_identity` resource
2017-05-09 17:14:51 +10:00
Radek Simko
178488f4bd
provider/kubernetes: Add support for limit_range ( #14285 )
2017-05-09 05:07:17 +02:00
Dmitrii Korotovskii
ace0456d58
http provider and http request data source
2017-05-08 17:37:48 -07:00
emily
64c2e68de9
Add additional properties for google resource storage bucket object. ( #14259 )
2017-05-08 16:35:47 -07:00
Radek Simko
296a3b2381
provider/kubernetes: Add support for resource_quota ( #13914 )
2017-05-08 13:43:24 +02:00
Paul Stack
221a88610b
provider/aws: Add support for importing Kinesis Streams ( #14278 )
...
Fixes : #14260
```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSKinesisStream_import'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/05/08 10:32:47 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSKinesisStream_import -timeout 120m
=== RUN TestAccAWSKinesisStream_importBasic
--- PASS: TestAccAWSKinesisStream_importBasic (101.93s)
PASS
ok github.com/hashicorp/terraform/builtin/providers/aws 101.978s
```
2017-05-08 14:11:23 +03:00
Paddy
8b78d5b233
providers/google: add google_container_versions data source.
...
Add a data source for listing available versions for Container Engine
clusters or retrieving the latest available version.
This is mostly to support our tests for specifying a version for cluster
creation; the withVersion test has been updated to use the data source,
meaning it will stop failing on us as new versions get released.
2017-05-08 00:38:11 -07:00
Russ Van Bert
e88ca0b744
Grammar correction in alarm description ( #14276 )
2017-05-08 09:35:59 +03:00
Jake Champlin
88c6e95e4f
Merge pull request #14245 from hashicorp/f-add-arn-security-group-data-source
...
provider/aws: Add ARN to security group data source
2017-05-05 15:12:34 -04:00
Jake Champlin
06b5fbf9ef
add docs
2017-05-05 13:58:15 -04:00
liz abinante!
081e72f9f8
Merge pull request #14185 from hashicorp/liz/tfe-variables
...
[website] docs for TFE personal env + org variables
2017-05-05 10:38:00 -07:00
Glen Mailer
4ac56338de
Improve tests and documentation for azurerm_template_deployment outputs ( #13567 )
...
* Improve tests and documentation for azurerm_template_deployment outputs
* Updating to match the latest changes in master
2017-05-05 17:51:59 +01:00