]> git.immae.eu Git - github/fretlink/terraform-provider-statuscake.git/log
github/fretlink/terraform-provider-statuscake.git
5 years agoupdate vendor and go.mod add_contact_groups
Alexandre Garand [Fri, 9 Aug 2019 13:59:15 +0000 (15:59 +0200)] 
update vendor and go.mod

5 years agoadd contact_group resource to the provider
Alexandre Garand [Fri, 9 Aug 2019 09:02:14 +0000 (11:02 +0200)] 
add contact_group resource to the provider

5 years agoCleanup after v1.0.0 release
tf-release-bot [Tue, 2 Jul 2019 18:01:29 +0000 (18:01 +0000)] 
Cleanup after v1.0.0 release

5 years agov1.0.0
tf-release-bot [Tue, 2 Jul 2019 17:54:37 +0000 (17:54 +0000)] 
v1.0.0

5 years agoMerge pull request #39 from jcalonso/update-changelog
Mat Schaffer [Tue, 25 Jun 2019 12:57:16 +0000 (21:57 +0900)] 
Merge pull request #39 from jcalonso/update-changelog

Update CHANGELOG.md

5 years agoUpdate CHANGELOG.md
Juan Carlos Alonso [Sat, 22 Jun 2019 10:19:31 +0000 (11:19 +0100)] 
Update CHANGELOG.md

5 years agoMerge pull request #36 from nauxliu/importer
Mat Schaffer [Sat, 22 Jun 2019 02:53:00 +0000 (11:53 +0900)] 
Merge pull request #36 from nauxliu/importer

Add importer

5 years agoMerge pull request #35 from ivanschwarz/feat/ssl-validation-2
Mat Schaffer [Sat, 22 Jun 2019 02:09:48 +0000 (11:09 +0900)] 
Merge pull request #35 from ivanschwarz/feat/ssl-validation-2

Add SSL validation feature for uptime tests

5 years agoAdd importer
Xiangxuan Liu [Tue, 18 Jun 2019 03:21:00 +0000 (11:21 +0800)] 
Add importer

5 years agoAdd enable_ssl_alert feature for uptime tests
Ivan Schwarz [Fri, 14 Jun 2019 13:55:36 +0000 (15:55 +0200)] 
Add enable_ssl_alert feature for uptime tests

5 years agoUpdate client dependency
Ivan Schwarz [Fri, 14 Jun 2019 13:41:14 +0000 (15:41 +0200)] 
Update client dependency

5 years agoMerge pull request #34 from jcalonso/fix/contact-group-backwards-compatible
Mat Schaffer [Thu, 13 Jun 2019 05:59:37 +0000 (14:59 +0900)] 
Merge pull request #34 from jcalonso/fix/contact-group-backwards-compatible

Add support back for contact_id and mark it as deprecated

5 years agoUpdate docs reflecting contact_id deprecation
Juan Carlos Alonso [Mon, 10 Jun 2019 13:41:25 +0000 (14:41 +0100)] 
Update docs reflecting contact_id deprecation

5 years agoAdd support for contact_id and mark it as deprecated
Juan Carlos Alonso [Mon, 10 Jun 2019 11:19:15 +0000 (12:19 +0100)] 
Add support for contact_id and mark it as deprecated

This makes the contact_group change backwards compatible

5 years agoMerge pull request #32 from ndench/0.12-compatibility
Mat Schaffer [Sun, 9 Jun 2019 23:40:12 +0000 (08:40 +0900)] 
Merge pull request #32 from ndench/0.12-compatibility

Upgrade to 0.12

5 years agoMerge pull request #1 from jcalonso/patch-1
Nathan Dench [Mon, 3 Jun 2019 22:40:38 +0000 (08:40 +1000)] 
Merge pull request #1 from jcalonso/patch-1

Fix acceptance tests

5 years agoFix acceptance tests
Juan Carlos Alonso [Mon, 3 Jun 2019 10:04:37 +0000 (11:04 +0100)] 
Fix acceptance tests

This was making the acceptance test to fail since it was using the hardcoded contact group in the code which doesn't exist any other account except for the initial developer.

https://github.com/ndench/terraform-provider-statuscake/commit/4efdab4181cd2bfd243600def27f70f0580942a3#diff-74acd2515ee5ecd44424d7a31439989eR221

This change now explicitly prompts the user to include the contact group

5 years agoUpgrade to 0.12
Nathan Dench [Fri, 24 May 2019 05:16:44 +0000 (15:16 +1000)] 
Upgrade to 0.12

5 years agoMerge pull request #27 from terraform-providers/go-modules-2019-02-22
appilon [Wed, 27 Feb 2019 21:43:31 +0000 (16:43 -0500)] 
Merge pull request #27 from terraform-providers/go-modules-2019-02-22

[MODULES] Switch to Go Modules

5 years agodeps: github.com/hashicorp/terraform@sdk-v0.11-with-go-modules
Alex Pilon [Fri, 22 Feb 2019 23:24:37 +0000 (18:24 -0500)] 
deps: github.com/hashicorp/terraform@sdk-v0.11-with-go-modules
Updated via: go get github.com/hashicorp/terraform@sdk-v0.11-with-go-modules and go mod tidy

5 years agodeps: use go modules for dep mgmt
Alex Pilon [Fri, 22 Feb 2019 23:24:22 +0000 (18:24 -0500)] 
deps: use go modules for dep mgmt
run go mod tidy
remove govendor from makefile and travis config
set appropriate env vars for go modules

5 years agoprovider: Ensured Go 1.11 in TravisCI and README
Alex Pilon [Fri, 22 Feb 2019 23:24:17 +0000 (18:24 -0500)] 
provider: Ensured Go 1.11 in TravisCI and README
provider: Run go fix
provider: Run go fmt
provider: Encode go version 1.11.5 to .go-version file

5 years agoMerge pull request #23 from terraform-providers/go1.11-upgrade-2019-01-07
Tom Harvey [Wed, 9 Jan 2019 10:45:03 +0000 (10:45 +0000)] 
Merge pull request #23 from terraform-providers/go1.11-upgrade-2019-01-07

[AUTOMATED] Upgrade to Go 1.11

5 years agoprovider: Require Go 1.11 in TravisCI and README
Alex Pilon [Mon, 7 Jan 2019 23:04:34 +0000 (18:04 -0500)] 
provider: Require Go 1.11 in TravisCI and README
provider: Run go fix
provider: Run go fmt

6 years agoUpdate CHANGELOG.md
Mat Schaffer [Mon, 20 Aug 2018 04:25:29 +0000 (13:25 +0900)] 
Update CHANGELOG.md

6 years agoMerge pull request #18 from matschaffer/contact-groups-support
Mat Schaffer [Mon, 20 Aug 2018 02:45:48 +0000 (11:45 +0900)] 
Merge pull request #18 from matschaffer/contact-groups-support

Add test contact group support

6 years agoUse linux checksum sha
Mat Schaffer [Mon, 6 Aug 2018 06:13:46 +0000 (15:13 +0900)] 
Use linux checksum sha

6 years agoRe-up vendored client
Mat Schaffer [Mon, 6 Aug 2018 05:22:27 +0000 (14:22 +0900)] 
Re-up vendored client

6 years agoReplace contact_id with contact_group
Mat Schaffer [Fri, 27 Jul 2018 08:17:56 +0000 (17:17 +0900)] 
Replace contact_id with contact_group

This allows for multiple contacts per test.

6 years agoUpdate test_tag handling to be a proper list of strings
Mat Schaffer [Fri, 27 Jul 2018 08:17:26 +0000 (17:17 +0900)] 
Update test_tag handling to be a proper list of strings

6 years agoUpdate github.com/DreamItGetIT/statuscake to PR-28
Mat Schaffer [Fri, 27 Jul 2018 08:15:39 +0000 (17:15 +0900)] 
Update github.com/DreamItGetIT/statuscake to PR-28

Will rebase this commit once the PR is merged

6 years agoCleanup after v0.2.0 release
tf-release-bot [Fri, 27 Jul 2018 05:43:20 +0000 (05:43 +0000)] 
Cleanup after v0.2.0 release

6 years agov0.2.0 stable-website v0.2.0
tf-release-bot [Fri, 27 Jul 2018 05:39:39 +0000 (05:39 +0000)] 
v0.2.0

6 years agoUpdate CHANGELOG.md
Radek Simko [Fri, 27 Jul 2018 05:35:18 +0000 (06:35 +0100)] 
Update CHANGELOG.md

6 years agoUpdate CHANGELOG.md
Radek Simko [Fri, 27 Jul 2018 05:25:48 +0000 (06:25 +0100)] 
Update CHANGELOG.md

6 years agoMerge pull request #12 from philax/patch-1
Mat Schaffer [Fri, 27 Jul 2018 02:54:13 +0000 (11:54 +0900)] 
Merge pull request #12 from philax/patch-1

Update acceptable test_type values

6 years agoUpdating to include #11
Mat Schaffer [Fri, 20 Jul 2018 07:15:13 +0000 (16:15 +0900)] 
Updating to include #11

6 years agoMerge pull request #11 from callstats-io/master
Mat Schaffer [Fri, 20 Jul 2018 07:14:02 +0000 (16:14 +0900)] 
Merge pull request #11 from callstats-io/master

Update statuscake library to latest version and use all the features from there.

6 years agoREADME.md: correct provider organization & missing repository name
kt [Wed, 2 May 2018 18:03:00 +0000 (11:03 -0700)] 
README.md: correct provider organization & missing repository name

6 years agoMerge pull request #13 from terraform-providers/f-make-website
Radek Simko [Mon, 30 Apr 2018 15:11:27 +0000 (16:11 +0100)] 
Merge pull request #13 from terraform-providers/f-make-website

make: Add website + website-test targets

6 years agomake: Add website + website-test targets
Radek Simko [Fri, 27 Apr 2018 16:01:12 +0000 (17:01 +0100)] 
make: Add website + website-test targets

6 years agoMerge pull request #2 from matschaffer/callstats-io-fixes-2
Andrew N Golovkov [Mon, 5 Feb 2018 08:17:59 +0000 (10:17 +0200)] 
Merge pull request #2 from matschaffer/callstats-io-fixes-2

Move template interpolation deeper into acceptance tests

6 years agoMove template interpolation deeper into acceptance tests
Mat Schaffer [Thu, 1 Feb 2018 13:53:16 +0000 (22:53 +0900)] 
Move template interpolation deeper into acceptance tests

Since it was failing `make test` on travis. Must be a better way to go about this, but I couldn't come up with a better way that defaulting the value to avoid the error when running non-acceptance tests.

6 years agoupdate github.com/DreamItGetIT/statuscake
Andrew N Golovkov [Wed, 31 Jan 2018 11:45:28 +0000 (13:45 +0200)] 
update github.com/DreamItGetIT/statuscake

6 years agoMerge pull request #1 from matschaffer/callstats-io-fixes
Andrew N Golovkov [Thu, 1 Feb 2018 11:24:08 +0000 (13:24 +0200)] 
Merge pull request #1 from matschaffer/callstats-io-fixes

Updates to avoid perpetual node location diff

6 years agoDon't attempt to set or verify values which aren't present in the details response
Mat Schaffer [Thu, 1 Feb 2018 07:15:21 +0000 (16:15 +0900)] 
Don't attempt to set or verify values which aren't present in the details response

The `TestCheckResourceAttr` tests can stay since they rely on the state from the previous apply.

6 years agoSwitch node locations to a set and consider empty string to be empty set
Mat Schaffer [Thu, 1 Feb 2018 07:14:33 +0000 (16:14 +0900)] 
Switch node locations to a set and consider empty string to be empty set

Note that we also don't check the individual locations anymore. The key numbers will be randomized and not testing content seems to be the method employed by the AWS provider as well https://github.com/terraform-providers/terraform-provider-aws/blob/81bba6b1f567aed561c6a6a30916504ee0886c68/aws/resource_aws_autoscaling_group_test.go#L404

6 years agoFix status & uptime assertions
Mat Schaffer [Thu, 1 Feb 2018 07:10:53 +0000 (16:10 +0900)] 
Fix status & uptime assertions

They were present in the details but the values were different during my testing. Hopefully this proves true for all future testing.

6 years agoRemove status codes default
Mat Schaffer [Thu, 1 Feb 2018 07:10:15 +0000 (16:10 +0900)] 
Remove status codes default

In my testing, the default response was `[""]` and having the default provided cause test assertion failures

6 years agoMark basic_pass sensitive
Mat Schaffer [Thu, 1 Feb 2018 07:08:10 +0000 (16:08 +0900)] 
Mark basic_pass sensitive

Avoids showing the password in plan output

6 years agoParameterize the contact ID used for acceptance testing
Mat Schaffer [Thu, 1 Feb 2018 07:07:31 +0000 (16:07 +0900)] 
Parameterize the contact ID used for acceptance testing

This allowed me to run acceptance tests on my own account.

6 years ago:pencil: Update acceptable test_type values
philax [Mon, 22 Jan 2018 22:00:21 +0000 (17:00 -0500)] 
:pencil: Update acceptable test_type values

6 years agomerge changes from https://github.com/DreamItGetIT/statuscake/pull/24 to vendor directory
Andrew N Golovkov [Wed, 17 Jan 2018 14:55:18 +0000 (16:55 +0200)] 
merge changes from https://github.com/DreamItGetIT/statuscake/pull/24 to vendor directory

6 years agofix type casts
Andrew N Golovkov [Wed, 17 Jan 2018 14:54:57 +0000 (16:54 +0200)] 
fix type casts

6 years agoupdate documentation
Andrew N Golovkov [Tue, 16 Jan 2018 14:11:47 +0000 (16:11 +0200)] 
update documentation

6 years ago`status` and `uptime` params is calculated
Andrew N Golovkov [Tue, 16 Jan 2018 14:11:43 +0000 (16:11 +0200)] 
`status` and `uptime` params is calculated

6 years agoupdate statuscake provider for support all the features from the statuscake module
Andrew N Golovkov [Tue, 16 Jan 2018 13:07:28 +0000 (15:07 +0200)] 
update statuscake provider for support all the features from the statuscake module

6 years agoupdate vendor/github.com/DreamItGetIT/statuscake to latest version
Andrew N Golovkov [Tue, 16 Jan 2018 13:05:10 +0000 (15:05 +0200)] 
update vendor/github.com/DreamItGetIT/statuscake to latest version

7 years agoMake CoC and support channels more visible
Radek Simko [Wed, 1 Nov 2017 22:06:20 +0000 (23:06 +0100)] 
Make CoC and support channels more visible

https://help.github.com/articles/adding-a-code-of-conduct-to-your-project/
https://help.github.com/articles/adding-support-resources-to-your-project/

7 years agoFixing logo
Jake Champlin [Thu, 31 Aug 2017 15:08:07 +0000 (11:08 -0400)] 
Fixing logo

7 years agoMerge pull request #3 from terraform-providers/vendor-tf-0.10
Radek Simko [Mon, 14 Aug 2017 14:10:17 +0000 (16:10 +0200)] 
Merge pull request #3 from terraform-providers/vendor-tf-0.10

vendor: github.com/hashicorp/terraform/...@v0.10.0

7 years agovendor: github.com/hashicorp/terraform/...@v0.10.0
Radek Simko [Thu, 10 Aug 2017 12:38:14 +0000 (14:38 +0200)] 
vendor: github.com/hashicorp/terraform/...@v0.10.0

7 years agovendor: Ignore github.com/hashicorp/terraform/backend
Radek Simko [Thu, 10 Aug 2017 12:37:14 +0000 (14:37 +0200)] 
vendor: Ignore github.com/hashicorp/terraform/backend

This is to avoid dependency sprawl - e.g. vendoring AWS or Azure SDK
when we don't really need remote backend functionality
in provider code - it's core's responsibility.

7 years agoFixing link in README
Jake Champlin [Fri, 21 Jul 2017 15:44:05 +0000 (11:44 -0400)] 
Fixing link in README

7 years agoAdding back the GNUmakefile test-compile step
stack72 [Fri, 30 Jun 2017 08:19:13 +0000 (11:19 +0300)] 
Adding back the GNUmakefile test-compile step

7 years agoSimplifying the GNUMakefile
stack72 [Thu, 29 Jun 2017 13:50:30 +0000 (16:50 +0300)] 
Simplifying the GNUMakefile

7 years agoFix Changelog Links Script for statuscake provider
Jake Champlin [Mon, 26 Jun 2017 18:00:40 +0000 (14:00 -0400)] 
Fix Changelog Links Script for statuscake provider

7 years agoCleanup after v0.1.0 release
TeamCity [Wed, 21 Jun 2017 09:19:46 +0000 (09:19 +0000)] 
Cleanup after v0.1.0 release

7 years agov0.1.0 v0.1.0
TeamCity [Wed, 21 Jun 2017 09:14:16 +0000 (09:14 +0000)] 
v0.1.0

7 years agoUpdate CHANGELOG.md
Paul Stack [Tue, 20 Jun 2017 15:43:43 +0000 (18:43 +0300)] 
Update CHANGELOG.md

7 years agoUpdating Makefile + Add gitignore
Jake Champlin [Fri, 9 Jun 2017 18:37:05 +0000 (14:37 -0400)] 
Updating Makefile + Add gitignore

7 years agoTransfer of provider code
Jake Champlin [Fri, 9 Jun 2017 17:54:32 +0000 (17:54 +0000)] 
Transfer of provider code

7 years agoMerge branch 'master' of /home/ubuntu/terraform-vendor
Jake Champlin [Fri, 9 Jun 2017 17:53:46 +0000 (17:53 +0000)] 
Merge branch 'master' of /home/ubuntu/terraform-vendor

7 years agoTransfer statuscake provider
Jake Champlin [Fri, 9 Jun 2017 17:53:46 +0000 (17:53 +0000)] 
Transfer statuscake provider

7 years agoTransfer of provider website docs
Jake Champlin [Fri, 9 Jun 2017 15:32:24 +0000 (11:32 -0400)] 
Transfer of provider website docs

7 years agoMerge branch 'master' of /Users/jake/terraform
Jake Champlin [Fri, 9 Jun 2017 15:32:24 +0000 (11:32 -0400)] 
Merge branch 'master' of /Users/jake/terraform

7 years agoTransfer statuscake provider website
Jake Champlin [Fri, 9 Jun 2017 15:32:22 +0000 (11:32 -0400)] 
Transfer statuscake provider website

7 years agoUpdating Makefile + Add gitignore
Jake Champlin [Tue, 6 Jun 2017 20:29:54 +0000 (16:29 -0400)] 
Updating Makefile + Add gitignore

7 years agoInitial transfer of provider code
Jake Champlin [Tue, 6 Jun 2017 16:40:07 +0000 (12:40 -0400)] 
Initial transfer of provider code

7 years agoMerge branch 'master' of /Users/jake/terraform
Jake Champlin [Tue, 6 Jun 2017 16:40:02 +0000 (12:40 -0400)] 
Merge branch 'master' of /Users/jake/terraform

7 years agoTransfer statuscake provider
Jake Champlin [Tue, 6 Jun 2017 16:40:02 +0000 (12:40 -0400)] 
Transfer statuscake provider

7 years agoAdd Issue Template
Jake Champlin [Tue, 6 Jun 2017 13:19:45 +0000 (09:19 -0400)] 
Add Issue Template

7 years agoinitial commit
Jake [Mon, 5 Jun 2017 20:54:15 +0000 (20:54 +0000)] 
initial commit

7 years agoMassively add HCL source tag in docs Markdown files
Max Riveiro [Mon, 17 Apr 2017 10:17:54 +0000 (13:17 +0300)] 
Massively add HCL source tag in docs Markdown files

Signed-off-by: Max Riveiro <kavu13@gmail.com>
7 years agonuke duplicate contact_id in statuscake docs (#13528)
Alex Boyd [Tue, 11 Apr 2017 09:07:33 +0000 (03:07 -0600)] 
nuke duplicate contact_id in statuscake docs (#13528)

7 years agoprovider/statuscake: Adding TriggerRate param to docs (#13503)
Paul Stack [Mon, 10 Apr 2017 12:58:41 +0000 (15:58 +0300)] 
provider/statuscake: Adding TriggerRate param to docs (#13503)

7 years agoAdd support for StatusCake trigger rate
Rui Gonçalves [Tue, 4 Apr 2017 15:58:11 +0000 (16:58 +0100)] 
Add support for StatusCake trigger rate

7 years agoprovider/statuscake: use default status code list when updating test (#12375)
Andre Silva [Sun, 5 Mar 2017 13:44:22 +0000 (13:44 +0000)] 
provider/statuscake: use default status code list when updating test (#12375)

7 years agowebsite/docs: Run `terraform fmt` on code examples (#12075)
George Christou [Sat, 18 Feb 2017 22:48:50 +0000 (22:48 +0000)] 
website/docs: Run `terraform fmt` on code examples (#12075)

* docs/vsphere: Fix code block

* docs: Convert `...` to `# ...` to allow `terraform fmt`ing

* docs: Trim trailing whitespace

* docs: First-pass run of `terraform fmt` on code examples

7 years agoprovider/statuscake: Fixing up the StatusCake acceptance tests (#12006)
Paul Stack [Thu, 16 Feb 2017 14:20:23 +0000 (16:20 +0200)] 
provider/statuscake: Fixing up the StatusCake acceptance tests (#12006)

```
% make testacc TEST=./builtin/providers/statuscake                                                      2 ↵ ✹
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/02/16 15:30:40 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/statuscake -v  -timeout 120m
=== RUN   TestProvider
--- PASS: TestProvider (0.00s)
=== RUN   TestProvider_impl
--- PASS: TestProvider_impl (0.00s)
=== RUN   TestAccStatusCake_basic
--- PASS: TestAccStatusCake_basic (2.14s)
=== RUN   TestAccStatusCake_tcp
--- PASS: TestAccStatusCake_tcp (1.66s)
=== RUN   TestAccStatusCake_withUpdate
--- PASS: TestAccStatusCake_withUpdate (3.62s)
PASS
ok   github.com/hashicorp/terraform/builtin/providers/statuscake 7.435s
```

7 years agoprovider/statuscake: Add support for Port in statuscake_test (#11966)
Paul Stack [Wed, 15 Feb 2017 23:29:05 +0000 (23:29 +0000)] 
provider/statuscake: Add support for Port in statuscake_test (#11966)

Fixes: #11923
This required the upstream library to have a PR accepted

7 years agoprovider/statuscake: Add support for Port in statuscake_test (#11966)
Paul Stack [Wed, 15 Feb 2017 23:29:05 +0000 (23:29 +0000)] 
provider/statuscake: Add support for Port in statuscake_test (#11966)

Fixes: #11923
This required the upstream library to have a PR accepted

7 years agoFix statuscake test timeout schema (#11541)
Rui Gonçalves [Tue, 31 Jan 2017 12:44:06 +0000 (12:44 +0000)] 
Fix statuscake test timeout schema (#11541)

7 years agoMerge branch 'statuscake_adding_contact_group' of https://github.com/ldjohnson/terraf...
stack72 [Tue, 17 Jan 2017 16:11:23 +0000 (16:11 +0000)] 
Merge branch 'statuscake_adding_contact_group' of https://github.com/ldjohnson/terraform into ldjohnson-statuscake_adding_contact_group

7 years agoMerge branch 'statuscake_adding_contact_group' of https://github.com/ldjohnson/terraf...
stack72 [Tue, 17 Jan 2017 16:11:23 +0000 (16:11 +0000)] 
Merge branch 'statuscake_adding_contact_group' of https://github.com/ldjohnson/terraform into ldjohnson-statuscake_adding_contact_group

7 years agoAdd support for StatusCake confirmation servers (#11179)
Sam Crang [Fri, 13 Jan 2017 11:35:15 +0000 (11:35 +0000)] 
Add support for StatusCake confirmation servers (#11179)

* Add support for StatusCake confirmation servers

* Add documentation for new StatusCake confirmations argument

7 years agoAdd support for StatusCake confirmation servers (#11179)
Sam Crang [Fri, 13 Jan 2017 11:35:15 +0000 (11:35 +0000)] 
Add support for StatusCake confirmation servers (#11179)

* Add support for StatusCake confirmation servers

* Add documentation for new StatusCake confirmations argument

7 years agoprovider/statuscake: fix StatusCake tests (#10660)
Rui Gonçalves [Sun, 11 Dec 2016 19:41:49 +0000 (19:41 +0000)] 
provider/statuscake: fix StatusCake tests (#10660)

* Update vendored statuscake SDK

* Set all attributes when upserting statuscake tests

7 years agosimplifying tests by removing tests and test data that is no longer needed
Lee Johnson [Tue, 29 Nov 2016 21:03:58 +0000 (16:03 -0500)] 
simplifying tests by removing tests and test data that is no longer needed

7 years agoMerge remote-tracking branch 'origin/master' into statuscake_adding_contact_group
Lee Johnson [Tue, 29 Nov 2016 20:27:04 +0000 (15:27 -0500)] 
Merge remote-tracking branch 'origin/master' into statuscake_adding_contact_group