Skip to content
This repository was archived by the owner on May 9, 2025. It is now read-only.

Commit e7fc22e

Browse files
committed
Merge release branch into master [skip ci]
2 parents 754ae64 + 7f31b05 commit e7fc22e

File tree

6 files changed

+23
-16
lines changed

6 files changed

+23
-16
lines changed

CHANGELOG.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,34 @@
11
# Change Log
22

3-
## [v2.0.0](https://github.com/nubisproject/nubis-docs/tree/v2.0.0) (2017-10-05)
4-
[Full Changelog](https://github.com/nubisproject/nubis-docs/compare/v2.0.0...v2.0.0)
3+
## [v2.0.1](https://github.com/nubisproject/nubis-docs/tree/v2.0.1) (2017-10-13)
4+
[Full Changelog](https://github.com/nubisproject/nubis-docs/compare/v2.0.0...v2.0.1)
5+
6+
**Closed issues:**
7+
8+
- \#awsadminmfa - AWS Administrative accounts don't require MFA [\#127](https://github.com/nubisproject/nubis-docs/issues/127)
9+
- \[meta\] Get rid of CloudFormation [\#121](https://github.com/nubisproject/nubis-docs/issues/121)
10+
- \[meta\] Get rid of DataDog [\#120](https://github.com/nubisproject/nubis-docs/issues/120)
11+
- Document --debug tricks for Packer and nubis-builder [\#45](https://github.com/nubisproject/nubis-docs/issues/45)
512

613
**Merged pull requests:**
714

8-
- Fixing a couple typos and removing a couple dead links. [\#205](https://github.com/nubisproject/nubis-docs/pull/205) ([cvalaas](https://github.com/cvalaas))
15+
- Bumping for nubis-builder [\#210](https://github.com/nubisproject/nubis-docs/pull/210) ([limed](https://github.com/limed))
16+
- Add v2.0.0 release presentation [\#209](https://github.com/nubisproject/nubis-docs/pull/209) ([tinnightcap](https://github.com/tinnightcap))
917

1018
## [v2.0.0](https://github.com/nubisproject/nubis-docs/tree/v2.0.0) (2017-10-05)
1119
[Full Changelog](https://github.com/nubisproject/nubis-docs/compare/v1.5.1-doc2...v2.0.0)
1220

1321
**Closed issues:**
1422

23+
- Tag v2.0.0 release [\#206](https://github.com/nubisproject/nubis-docs/issues/206)
1524
- Tag v2.0.0 release [\#202](https://github.com/nubisproject/nubis-docs/issues/202)
1625
- Tag v2.0.0 release [\#199](https://github.com/nubisproject/nubis-docs/issues/199)
1726

1827
**Merged pull requests:**
1928

29+
- Merge v2.0.0 release into develop. \[skip ci\] [\#208](https://github.com/nubisproject/nubis-docs/pull/208) ([tinnightcap](https://github.com/tinnightcap))
30+
- Update CHANGELOG for v2.0.0 release \[skip ci\] [\#207](https://github.com/nubisproject/nubis-docs/pull/207) ([tinnightcap](https://github.com/tinnightcap))
31+
- Fixing a couple typos and removing a couple dead links. [\#205](https://github.com/nubisproject/nubis-docs/pull/205) ([cvalaas](https://github.com/cvalaas))
2032
- Merge v2.0.0 release into develop. \[skip ci\] [\#204](https://github.com/nubisproject/nubis-docs/pull/204) ([tinnightcap](https://github.com/tinnightcap))
2133
- Update CHANGELOG for v2.0.0 release \[skip ci\] [\#203](https://github.com/nubisproject/nubis-docs/pull/203) ([tinnightcap](https://github.com/tinnightcap))
2234
- Merge v2.0.0 release into develop. \[skip ci\] [\#201](https://github.com/nubisproject/nubis-docs/pull/201) ([tinnightcap](https://github.com/tinnightcap))

PREREQUISITES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ deploy:
356356

357357
```bash
358358

359-
vault-exec "${NUBIS_DOCKER[@]}" -e GIT_COMMIT_SHA=$(git rev-parse HEAD) nubisproject/nubis-builder:v0.4.0
359+
vault-exec "${NUBIS_DOCKER[@]}" -e GIT_COMMIT_SHA=$(git rev-parse HEAD) nubisproject/nubis-builder:v0.5.0
360360

361361
```
362362

README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ would add to this effort.
99

1010
## Getting started with the Nubis Project
1111

12-
Welcome to the Nubis Project. We hope you will find that it meats your
12+
Welcome to the Nubis Project. We hope you will find that it meets your
1313
requirements and is easy to use. In this document I will introduce you to the
1414
Nubis Project and give you a number of links to other documents that will help
1515
you along.
@@ -27,13 +27,9 @@ Now, to get you up to speed with everything you will need to know to use the
2727
Nubis Project, I will provide for you a reading list. Not to worry, while this
2828
list looks long most of the documents are quite short.
2929

30-
* [Nubis Overview](https://github.com/Nubisproject/nubis-docs/blob/master/SYSTEM_OVERVIEW.md)
31-
Will give you an outline of the pieces of the project.
3230
* [Git & GitHub](https://github.com/Nubisproject/nubis-docs/blob/master/GIT_GITHUB.md)
3331
provides some advice specific to Nubis.
34-
* [CloudFormation](https://github.com/Nubisproject/nubis-docs/blob/master/CLOUDFORMATION.md)
35-
walks through some recomendations on structure and workflow.
36-
* [Project Onbording](https://github.com/Nubisproject/nubis-docs/blob/master/PROJECT_ONBOARDING.md)
32+
* [Project Onboarding](https://github.com/Nubisproject/nubis-docs/blob/master/PROJECT_ONBOARDING.md)
3733
will guide you through on-boarding your first application.
3834

3935
### Deployment
@@ -43,8 +39,7 @@ coding. The first step is to assemble your deployment repository. Then it will
4339
be time to deploy into the sandbox.
4440

4541
As we have seen in various examples through these documents, you will need to
46-
create a deployment repository. Take a look at the [System Overview](https://github.com/Nubisproject/nubis-docs/blob/master/SYSTEM_OVERVIEW.md)
47-
document for details.
42+
create a deployment repository.
4843

4944
Once your repository is all set up the next step it to deploy into the sandbox.
5045
You can deploy by following the procedures outlined in the [Project Onbording](https://github.com/Nubisproject/nubis-docs/blob/master/PROJECT_ONBOARDING.md#application-build-out)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ NUBIS_DOCKER=( 'docker' 'run' \
2929

3030
```bash
3131

32-
vault-exec "${NUBIS_DOCKER[@]}" -e GIT_COMMIT_SHA=$(git rev-parse HEAD) nubisproject/nubis-builder:v0.4.0
32+
vault-exec "${NUBIS_DOCKER[@]}" -e GIT_COMMIT_SHA=$(git rev-parse HEAD) nubisproject/nubis-builder:v0.5.0
3333

3434
```
3535

dashboard/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Welcome to the Nubis Dashboard. Here you will find links to all of the tools
88
available in this account.
99

10-
We have also included some sample, cheet sheet style help for you along with
10+
We have also included some sample, cheat sheet style help for you along with
1111
links to documentation about each tool.
1212

1313
If you have any questions, please reach out to the Nubis team on slack or irc
@@ -26,7 +26,7 @@ The key-value store is where run-time configuration is stored. We are using
2626
[Consul](https://www.consul.io/) as both the key-value store as well as for
2727
service discovery.
2828

29-
**TODO:** Add me some helpfull cheet-sheet commands.
29+
**TODO:** Add me some helpfull cheat-sheet commands.
3030

3131
You can find the official documentation [here](https://www.consul.io/docs/index.html).
3232

@@ -35,7 +35,7 @@ You can find the official documentation [here](https://www.consul.io/docs/index.
3535
We are using [Prometheus](https://prometheus.io/) as the monitoring service in
3636
this account.
3737

38-
**TODO:** Add me some helpfull cheet-sheet commands.
38+
**TODO:** Add me some helpfull cheat-sheet commands.
3939

4040
You can find the official documentation [here](https://prometheus.io/docs/introduction/overview/).
4141

72.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)