fix of Merge of Elasticsearch 2.1 branch to master

petalmd / armor

Apache License 2.0

15 stars 8 forks source link

fix of Merge of Elasticsearch 2.1 branch to master #17

Closed jehuty0shift closed 8 years ago

jehuty0shift commented 8 years ago

Hello,

As promised (sorry for the delay) I fixed the merge by introducing a new variable called armor.allow_kibana_actions. By setting this variable at true, all Kibana actions are allowed by default. I updated the doc accordingly. Thanks ! !

coveralls commented 8 years ago

Coverage decreased (-0.7%) to 70.399% when pulling 90c5470fbbd0c5362ccf86829894818c6700948f on jehuty0shift:master into d11002f46bb3011079e7d5f5b0ee5f945f0401cf on petalmd:master.

jmaitrehenry commented 8 years ago

Thanks again! I just merge it into master.