[2/2] metron git commit: Merge branch 'master' into feature/METRON-1416-upgrade-solr

Merge branch 'master' into feature/METRON-1416-upgrade-solr Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/a89a72c3 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/a89a72c3 Diff:

metron git commit: METRON-1617: Make threat triage score function with dots as well as colons closes apache/incubator-metron#1062

Repository: metron Updated Branches: refs/heads/master 828ab7134 -> b081e80c0 METRON-1617: Make threat triage score function with dots as well as colons closes apache/incubator-metron#1062 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit:

metron git commit: METRON-1613 Metaalerts status update broken in Alerts UI (merrimanr) closes apache/metron#1059

Repository: metron Updated Branches: refs/heads/feature/METRON-1416-upgrade-solr 0e4842799 -> 10271c41b METRON-1613 Metaalerts status update broken in Alerts UI (merrimanr) closes apache/metron#1059 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: