Repository: incubator-metron Updated Branches: refs/heads/master 0d5fdf419 -> 8532e2848
METRON-945 Resolve merge conflict in metron.spec (dlyle via justinleet) closes apache/incubator-metron#576 Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/8532e284 Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/8532e284 Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/8532e284 Branch: refs/heads/master Commit: 8532e2848c4767405f4bfe6501c251b1aab54f01 Parents: 0d5fdf4 Author: dlyle <[email protected]> Authored: Wed May 10 08:38:37 2017 -0400 Committer: leet <[email protected]> Committed: Wed May 10 08:38:37 2017 -0400 ---------------------------------------------------------------------- .../packaging/docker/rpm-docker/SPECS/metron.spec | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8532e284/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec b/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec index da8f192..e851c7f 100644 --- a/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec +++ b/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec @@ -269,11 +269,8 @@ This package installs the Metron Indexing files %{metron_home}/config/zookeeper/indexing/asa.json %{metron_home}/config/zookeeper/indexing/error.json %{metron_home}/config/zeppelin/metron/metron-yaf-telemetry.json -<<<<<<< HEAD %{metron_home}/config/zeppelin/metron/metron-connection-report.json -======= %{metron_home}/config/zeppelin/metron/metron-ip-report.json ->>>>>>> 1cace9ff29f31301d74fa6a7b2630d471452e985 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -403,15 +400,12 @@ This package installs the Metron Management UI %{metron_home} # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %changelog -<<<<<<< HEAD * Thu May 4 2017 Ryan Merriman <[email protected]> - 0.4.0 - Added REST -* Fri Apr 28 2017 Apache Metron <[email protected]> - 0.4.0 -- Add Zeppelin Connection Report Dashboard -======= * Tue May 2 2017 David Lyle <[email protected]> - 0.4.0 - Add Metron IP Report ->>>>>>> 1cace9ff29f31301d74fa6a7b2630d471452e985 +* Fri Apr 28 2017 Apache Metron <[email protected]> - 0.4.0 +- Add Zeppelin Connection Report Dashboard * Thu Jan 19 2017 Justin Leet <[email protected]> - 0.3.1 - Replace GeoIP files with new implementation * Thu Nov 03 2016 David Lyle <[email protected]> - 0.2.1
