tree a60c040d0451c1fb71124186cd1d3e1d20cbea5f
parent 515356fe8cf28500716fd2905258dbc2ac9e3655
author Petr Michalec <epcim@apealive.net> 1511954930 +0100
committer Petr Michalec <epcim@apealive.net> 1511954930 +0100
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJaHpnyAAoJEFuNt0QI+SlqV7wP/3VA2TpAtjQ5Rm9Rcl1orFh4
 42F9WBfDLT3IrXM14oRx+LPk6aPw9SxHzQIHQxK+Kn0QRA/udO6ojR4Ci4n+7iPv
 vgSAbX/tVwC542QAAccR4BIw/uTsVqr6Q17wwFDK00673jCPK6L4g9NuN5ckWx/s
 8RIBBkJQ+qMUJy+MJ3MnVgRYn6mTFKSdkJCkjr3dsb6hG5RgF/7hMrsEnGoRBEXx
 e5mkCY+8Xp9k/VH4y/VWCl/5P18bp2w46f3LCkslxuTJqCLNuzjiCEzKbhZ2KddW
 RUF/XICC9+ozv0lBRMD+DeOTc5MIT2iQLDZIXvG84ZpMZHozbXkCwZfgpTKf7WKf
 AV/QIdbZ4N2MHfvAhu5FIaqDnQnRcgDnlU6Ts1Vmoin9ABKFsRK1x7Svj/I68MR/
 Y+5IjjgM+e/dmwG9hZfVGnsm1otvLoNruYCV/sPgPPmAhXo+G47mC8IwFyIID4NV
 jy/chjuDT+Tiom1b0Do28XDeP2DyknXSm1r/YtMYvUO2zPx4vuGjTNnNTGjrpfSA
 1obO/1wnM+A7xr+FC8Nnz/qO+5NagNhsMP/hDu3Dirx5XoLzhL7zFw0D/Gli5H1x
 mmMbDdPgmq07iyz8yAi1autXzJ3QIAp5jTPud0uLy59Mwx4no5wl9Jv113dalAJ3
 YaQct+3hKgPJYN2unKX9
 =xeo7
 -----END PGP SIGNATURE-----

merge .env and .pillar states

Change-Id: Ie5955b29b0bbdc502ad71de9bb50e38b6a8896bd