RedHatTraining/rht-labs-docs.git

tpage

2018-05-29 fdc4484fdae837483b3e83f53a34b32f6c5ec0a8

refs
author	tpage <tpage@redhat.com>
	Tuesday, May 29, 2018 16:09 +0200
committer	tpage <tpage@redhat.com>
	Tuesday, May 29, 2018 16:09 +0200
commit	fdc4484fdae837483b3e83f53a34b32f6c5ec0a8
tree	70c82d86afb94efdaf8970f9a6d8445d0889f07a tree \| zip \| gz
parent	be0752bfacd444d61bb5a2f8ee6a2293c662bf7a view \| diff 5e0a20c390d5d8fe921fb978b649f1ab099f564b view \| diff

Fixed merge conflicts

74 files added

8 files modified

	exercises/1-the-manual-menace/README.md	88 ●●●●● diff \| view \| raw \| blame \| history
	exercises/2-attack-of-the-pipelines/README.md	42 ●●●●● diff \| view \| raw \| blame \| history
	exercises/3-revenge-of-the-automated-testing/README.md	42 ●●●●● diff \| view \| raw \| blame \| history
	exercises/4-an-enslaved-hope/README.md	52 ●●●●● diff \| view \| raw \| blame \| history
	exercises/5-non-functionals-strike-back/README.md	28 ●●●●● diff \| view \| raw \| blame \| history
	exercises/6-return-of-the-app-monitoring/README.md	2 ●●●●● diff \| view \| raw \| blame \| history
	exercises/7-the-cluster-awakens/README.md	6 ●●●●● diff \| view \| raw \| blame \| history
	exercises/8-the-last-unicorn-dev/README.md	8 ●●●●● diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/big-picture-complete.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/ansible.jpeg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/arachni.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/atomic.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/container-empty.pdf	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/gitlab.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/jenkins.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/jest.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/mocha.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/mongodb.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/nexus.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/nightwatch.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/nodejs.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/npm.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/npm.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/openshift.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/pipe-bake.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/pipe-build.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/pipe-deploy.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/pipe-e2e.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/pipe-perf-test.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/pipe-security.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/postgresql.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/shell.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/shell.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/slave-arachni.pdf	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/slave-arachni.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/slave-nightwatch.pdf	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/slave-nightwatch.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/slave-npm.pdf	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/slave-shell.pdf	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/slave-zap.pdf	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/slave-zap.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/vuejs.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/originals/zap.jpg	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/ansible-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/arachni-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/atomic-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/container-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/dino-derek2-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/dino-pen-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/dino-tasha-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/gitlab-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/jenkins-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/jest-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/mocha-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/mongodb-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/nexus-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/nightwatch-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/nodejs-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/npm-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/openshift-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/postgresql-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/shell-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/vuejs-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/100-big-picture-and-dinosaur/transparent/zap-transparent.png	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-blade.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-constructor.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-derek2.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-derek2.jpg.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-donal.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-fire.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-ladder.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-parts.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-pen.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-perf.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-piranha.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-spikes.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/derek-devops-dinosaur/dino-tasha.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/what-is-devops/devops-loop.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/what-is-devops/devops-no-wall.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/what-is-devops/devops-wall.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/what-is-devops/gaps-1.jpg	diff \| view \| raw \| blame \| history
	facilitation/101-tech-practices/what-is-devops/gaps-2.jpg	diff \| view \| raw \| blame \| history