Skip to content
This repository has been archived by the owner on Jul 24, 2021. It is now read-only.

Commit

Permalink
Merge pull request #981 from joyent/ether/v3-b6-even-more-fixes
Browse files Browse the repository at this point in the history
v3 b6 even more fixes
  • Loading branch information
karenetheridge authored Feb 3, 2020
2 parents ffb440e + 5d4cd4a commit bfbe314
Show file tree
Hide file tree
Showing 345 changed files with 409 additions and 471 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ Exhibit A - Source Code Form License Notice

This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
file, You can obtain one at https://www.mozilla.org/en-US/MPL/2.0/.

If it is not possible or desirable to put the notice in a particular
file, then You may include the notice in a location (such as a LICENSE
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at <http://mozilla.org/MPL/2.0/>.
one at <https://www.mozilla.org/en-US/MPL/2.0/>.
2 changes: 1 addition & 1 deletion bin/conch
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ Copyright Joyent, Inc.
This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at L<http://mozilla.org/MPL/2.0/>.
one at L<https://www.mozilla.org/en-US/MPL/2.0/>.
=cut
4 changes: 2 additions & 2 deletions bin/conch-db
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ if (@ARGV and $ARGV[0] eq 'apply-dump-migration') {
require DBIx::Class::Schema::Loader::Base;
around 'DBIx::Class::Schema::Loader::Base::_default_custom_content' => sub {
my $orig = shift; my $self = shift;
return "\n\n1;\n__END__\n\n=pod\n\n=head1 LICENSING\n\nCopyright Joyent, Inc.\n\nThis Source Code Form is subject to the terms of the Mozilla Public License,\nv.2.0. If a copy of the MPL was not distributed with this file, You can obtain\none at L<http://mozilla.org/MPL/2.0/>.\n\n=cut\n# vim: set ts=4 sts=4 sw=4 et :\n";
return "\n\n1;\n__END__\n\n=pod\n\n=head1 LICENSING\n\nCopyright Joyent, Inc.\n\nThis Source Code Form is subject to the terms of the Mozilla Public License,\nv.2.0. If a copy of the MPL was not distributed with this file, You can obtain\none at L<https://www.mozilla.org/en-US/MPL/2.0/>.\n\n=cut\n# vim: set ts=4 sts=4 sw=4 et :\n";
};
DBIx::Class::Schema::Loader::make_schema_at(
$loader_config->{schema_class},
Expand Down Expand Up @@ -238,7 +238,7 @@ Copyright Joyent, Inc.
This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at L<http://mozilla.org/MPL/2.0/>.
one at L<https://www.mozilla.org/en-US/MPL/2.0/>.
=cut
# vim: set ts=4 sts=4 sw=4 et :
4 changes: 2 additions & 2 deletions cpanfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ requires 'Try::Tiny';
requires 'Time::HiRes';
requires 'Time::Moment', '>= 0.43'; # for PR#28, fixes use of stdbool.h (thanks Dale)
requires 'Time::Local', '1.27'; # https://pandorafms.com/blog/2020-perl/
requires 'JSON::Validator', '3.08';
requires 'JSON::Validator', '3.18'; # https://github.com/mojolicious/json-validator/pull/182
requires 'Data::Validate::IP'; # for json schema validation of 'ipv4', 'ipv6' types
requires 'HTTP::Tiny';
requires 'Safe::Isa';
Expand Down Expand Up @@ -82,7 +82,7 @@ on 'test' => sub {
requires 'Test::More';
requires 'Test::PostgreSQL', '1.27';
requires 'Test::Pod::Coverage';
requires 'YAML::XS';
requires 'YAML::XS', '0.81'; # http://blogs.perl.org/users/tinita/2020/01/making-yamlpm-yamlsyck-and-yamlxs-safer-by-default.html
requires 'Test::Pod', '1.41';
requires 'Test::Warnings';
requires 'Test::Fatal';
Expand Down
22 changes: 11 additions & 11 deletions cpanfile.snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -454,11 +454,11 @@ DISTRIBUTIONS
Crypt::UnixCrypt_XS 0.11
requirements:
ExtUtils::MakeMaker 0
DBD-Pg-3.8.1
pathname: T/TU/TURNSTEP/DBD-Pg-3.8.1.tar.gz
DBD-Pg-3.10.4
pathname: T/TU/TURNSTEP/DBD-Pg-3.10.4.tar.gz
provides:
Bundle::DBD::Pg v3.8.1
DBD::Pg v3.8.1
Bundle::DBD::Pg v3.10.4
DBD::Pg v3.10.4
requirements:
DBI 1.614
ExtUtils::MakeMaker 6.11
Expand Down Expand Up @@ -2205,10 +2205,10 @@ DISTRIBUTIONS
JSON::PP 2.27300
Scalar::Util 0
perl 5.006
JSON-Validator-3.11
pathname: J/JH/JHTHORSEN/JSON-Validator-3.11.tar.gz
JSON-Validator-3.18
pathname: J/JH/JHTHORSEN/JSON-Validator-3.18.tar.gz
provides:
JSON::Validator 3.11
JSON::Validator 3.18
JSON::Validator::Error undef
JSON::Validator::Formats undef
JSON::Validator::Joi undef
Expand Down Expand Up @@ -4029,11 +4029,11 @@ DISTRIBUTIONS
Win32::ShellQuote 0.003001
requirements:
perl 5.006
YAML-LibYAML-0.80
pathname: T/TI/TINITA/YAML-LibYAML-0.80.tar.gz
YAML-LibYAML-0.81
pathname: T/TI/TINITA/YAML-LibYAML-0.81.tar.gz
provides:
YAML::LibYAML 0.80
YAML::XS 0.80
YAML::LibYAML 0.81
YAML::XS 0.81
YAML::XS::LibYAML undef
requirements:
ExtUtils::MakeMaker 0
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, you can
obtain one at <http://mozilla.org/MPL/2.0/>.
obtain one at <https://www.mozilla.org/en-US/MPL/2.0/>.
2 changes: 1 addition & 1 deletion docs/json-schema/common.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$comment" : "NOTE: This file is for human reference ONLY. For programmatic use, use the GET '/schema/common/$schema_name' endpoints, or within conch itself, json-schema/common.yaml.",
"$schema" : "http://json-schema.org/draft-07/schema#",
"$schema" : "https://json-schema.org/draft-07/schema#",
"definitions" : {
"device_asset_tag" : {
"pattern" : "^\\S+$",
Expand Down
2 changes: 1 addition & 1 deletion docs/json-schema/device_report.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$comment" : "NOTE: This file is for human reference ONLY. For programmatic use, use the GET '/schema/device_report/$schema_name' endpoints, or within conch itself, json-schema/device_report.yaml.",
"$schema" : "http://json-schema.org/draft-07/schema#",
"$schema" : "https://json-schema.org/draft-07/schema#",
"definitions" : {
"DeviceReport_v3.0.0" : {
"description" : "the contents of a posted device report from relays and reporters",
Expand Down
2 changes: 1 addition & 1 deletion docs/json-schema/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, you can
obtain one at <http://mozilla.org/MPL/2.0/>.
obtain one at <https://www.mozilla.org/en-US/MPL/2.0/>.
2 changes: 1 addition & 1 deletion docs/json-schema/query_params.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$comment" : "NOTE: This file is for human reference ONLY. For programmatic use, use the GET '/schema/query_params/$schema_name' endpoints, or within conch itself, json-schema/query_params.yaml.\nNote: for now, defaults are for documentation purposes only. see https://github.com/mojolicious/json-validator/issues/158",
"$schema" : "http://json-schema.org/draft-07/schema#",
"$schema" : "https://json-schema.org/draft-07/schema#",
"definitions" : {
"BuildDevices" : {
"additionalProperties" : false,
Expand Down
2 changes: 1 addition & 1 deletion docs/json-schema/request.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$comment" : "NOTE: This file is for human reference ONLY. For programmatic use, use the GET '/schema/request/$schema_name' endpoints, or within conch itself, json-schema/request.yaml.",
"$schema" : "http://json-schema.org/draft-07/schema#",
"$schema" : "https://json-schema.org/draft-07/schema#",
"definitions" : {
"BuildAddOrganization" : {
"additionalProperties" : false,
Expand Down
2 changes: 1 addition & 1 deletion docs/json-schema/response.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$comment" : "NOTE: This file is for human reference ONLY. For programmatic use, use the GET '/schema/response/$schema_name' endpoints, or within conch itself, json-schema/response.yaml.",
"$schema" : "http://json-schema.org/draft-07/schema#",
"$schema" : "https://json-schema.org/draft-07/schema#",
"definitions" : {
"Build" : {
"additionalProperties" : false,
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/Conch.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::check_layouts.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::check_validation_plans.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::check_workspace_racks.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::clean_roles.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::copy_user_data.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::create_token.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::create_user.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::fix_usernames.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::force_password_change.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::merge_validation_results.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::new_organizations.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::thin_device_reports.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::update_validation_plans.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::workspace_to_build.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Command::workspaces.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::Build.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::Datacenter.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::DatacenterRoom.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::Device.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::DeviceInterface.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::DeviceLocation.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::DeviceReport.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::DeviceSettings.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::DeviceValidation.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::HardwareProduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::HardwareVendor.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::Login.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::Organization.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::Rack.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::RackLayout.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::RackRole.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::Relay.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::Schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::User.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
2 changes: 1 addition & 1 deletion docs/modules/Conch::Controller::Validation.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ Copyright Joyent, Inc.

This Source Code Form is subject to the terms of the Mozilla Public License,
v.2.0. If a copy of the MPL was not distributed with this file, You can obtain
one at [http://mozilla.org/MPL/2.0/](http://mozilla.org/MPL/2.0/).
one at [https://www.mozilla.org/en-US/MPL/2.0/](https://www.mozilla.org/en-US/MPL/2.0/).
Loading

0 comments on commit bfbe314

Please sign in to comment.