Conflicts:
	docs/public/01-introduction.asciidoc
	docs/public/02-architecture.asciidoc
	docs/public/03-gettingstarted.asciidoc
	docs/public/04-administration.asciidoc

Merging PR # 160, modulo RBAC diagram.

Original commit: elastic/x-pack-elasticsearch@5eeb9d82a3
This commit is contained in:
Paul Echeverri 2014-10-15 16:46:32 -07:00
commit 9a6600a2f3

Diff Content Not Available