Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master #97

Merged
merged 27 commits into from
Jan 29, 2019
Merged

Merge develop into master #97

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5d16d90
Documentation for --profile (#69)
mattias-p Feb 22, 2018
7b54bb1
Merge pull request #73 from dotse/develop
mattias-p Apr 16, 2018
ca01668
Updated "dotse" to "zonemaster" in files
matsduf Jun 26, 2018
1919e10
Merge pull request #81 from matsduf/move-from-dotse-to-zonemaster
matsduf Aug 9, 2018
4e29dec
Print information on STDERR if --json has been selected (#84)
matsduf Aug 17, 2018
1c97bca
Fix diagnostics output
mattias-p Aug 20, 2018
0d2b7b5
Improved L10N
mattias-p Aug 20, 2018
b28481a
Fix typo
mattias-p Aug 21, 2018
a34cf49
Merge pull request #85 from mattias-p/diagnostics
mattias-p Aug 23, 2018
d67b138
Only show spinner in human readable output mode
mattias-p Aug 23, 2018
5f85148
Merge pull request #86 from mattias-p/spinner
mattias-p Aug 24, 2018
c8c2171
Make --level and --stop_level case-insensitive
mattias-p Sep 3, 2018
5bb61b6
Clarify documentation of --progress option
mattias-p Sep 3, 2018
d201a8a
Merge pull request #87 from mattias-p/74-insensitive-level
mattias-p Sep 4, 2018
c6d6660
Merge pull request #88 from mattias-p/50-progress-doc
mattias-p Sep 4, 2018
92e6fc2
Merge branch 'develop' into profiles
mattias-p Oct 17, 2018
54ca73f
Merge pull request #89 from mattias-p/profiles
mattias-p Oct 17, 2018
1446107
- Deprecate config/policy options. Add profile options.
vlevigneron Nov 7, 2018
09dda8c
- Change of Zonemaster::Engine::Profile interface.
vlevigneron Nov 9, 2018
efc2b14
- Works with new version of Profile.pm.
vlevigneron Nov 20, 2018
3ee2eb0
- Fix dump-profile method.
vlevigneron Nov 20, 2018
f3b0373
Merge pull request #93 from vlevigneron/profiles
vlevigneron Dec 6, 2018
d581d0a
Test against current Engine develop branch
mattias-p Nov 7, 2018
5b66102
Update .travis.yml (#95)
matsduf Jan 9, 2019
d44ea74
Merge branch 'develop' into profiles
mattias-p Jan 9, 2019
b5276f7
Merge pull request #70 from zonemaster/profiles
mattias-p Jan 9, 2019
603502a
Prepartion for release v2.0.0 (#96)
matsduf Jan 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use ExtUtils::MakeMaker ();
name 'Zonemaster-CLI';
all_from 'lib/Zonemaster/CLI.pm';
resources(
repository => 'https://github.com/dotse/zonemaster-cli',
bugtracker => 'https://github.com/dotse/zonemaster-cli/issues',
repository => 'https://github.com/zonemaster/zonemaster-cli',
bugtracker => 'https://github.com/zonemaster/zonemaster-cli/issues',
);

tests_recursive( 't' );
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
Zonemaster CLI
==============
[![Build Status](https://travis-ci.org/dotse/zonemaster-engine.svg?branch=master)](https://travis-ci.org/dotse/zonemaster-engine)
[![Build Status](https://travis-ci.org/zonemaster/zonemaster-engine.svg?branch=master)](https://travis-ci.org/zonemaster/zonemaster-engine)
[![CPAN version](https://badge.fury.io/pl/Zonemaster-CLI.svg)](https://metacpan.org/pod/Zonemaster::CLI)

### Purpose

This Git repository is one of the components of the Zonemaster software and contains the source for the Zonemaster CLI utility.

For an overview of the Zonemaster software, please see the
[Zonemaster repository](https://github.com/dotse/zonemaster).
[Zonemaster repository](https://github.com/zonemaster/zonemaster).

## Prerequisite

Before you install the Zonemaster CLI utility, you need the
Zonemaster Engine test framework installed. Please see the
[Zonemaster Engine installation
instructions](https://github.com/dotse/zonemaster-engine/blob/master/docs/Installation.md).
instructions](https://github.com/zonemaster/zonemaster-engine/blob/master/docs/Installation.md).

Installation
============
Expand All @@ -31,7 +31,7 @@ This repository does not need any specific configuration.
### Documentation

Other than the installation documentation, no specific documentation is needed.
The [using](https://github.com/dotse/zonemaster-cli/blob/master/USING.md)
The [using](https://github.com/zonemaster/zonemaster-cli/blob/master/USING.md)
document provides an overview on how to use the CLI.


Expand Down
16 changes: 8 additions & 8 deletions docs/Installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ The command is expected to take a few seconds and print some results about the d

-------

[Declaration of prerequisites]: https://github.com/dotse/zonemaster/blob/master/README.md#prerequisites
[JSON-RPC API]: https://github.com/dotse/zonemaster-backend/blob/master/docs/API.md
[Main Zonemaster repository]: https://github.com/dotse/zonemaster/blob/master/README.md
[Zonemaster::Backend installation]: https://github.com/dotse/zonemaster-backend/blob/master/docs/Installation.md
[Zonemaster::Engine installation]: https://github.com/dotse/zonemaster-engine/blob/master/docs/Installation.md
[Zonemaster::Engine]: https://github.com/dotse/zonemaster-engine/blob/master/README.md
[Zonemaster::GUI installation]: https://github.com/dotse/zonemaster-gui/blob/master/docs/Installation.md
[Zonemaster::LDNS]: https://github.com/dotse/zonemaster-ldns/blob/master/README.md
[Declaration of prerequisites]: https://github.com/zonemaster/zonemaster/blob/master/README.md#prerequisites
[JSON-RPC API]: https://github.com/zonemaster/zonemaster-backend/blob/master/docs/API.md
[Main Zonemaster repository]: https://github.com/zonemaster/zonemaster/blob/master/README.md
[Zonemaster::Backend installation]: https://github.com/zonemaster/zonemaster-backend/blob/master/docs/Installation.md
[Zonemaster::Engine installation]: https://github.com/zonemaster/zonemaster-engine/blob/master/docs/Installation.md
[Zonemaster::Engine]: https://github.com/zonemaster/zonemaster-engine/blob/master/README.md
[Zonemaster::GUI installation]: https://github.com/zonemaster/zonemaster-gui/blob/master/docs/Installation.md
[Zonemaster::LDNS]: https://github.com/zonemaster/zonemaster-ldns/blob/master/README.md

Copyright (c) 2013 - 2017, IIS (The Internet Foundation in Sweden) \
Copyright (c) 2013 - 2017, AFNIC \
Expand Down