From 08a100c0020d1902f157c3c2f0562b87c535f23f Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Thu, 16 Jul 2015 10:21:37 -0700
Subject: [PATCH] HBASE-14104 Add vectorportal.com to NOTICES.txt as src of our
 logo

---
 NOTICE.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/NOTICE.txt b/NOTICE.txt
index 337c93beafc..50026edee18 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -18,3 +18,18 @@ for details: https://github.com/jruby/jruby/blob/master/COPYING
     
 The JRuby community went out of their way to make JRuby compatible with Apache
 projects: See https://issues.apache.org/jira/browse/HBASE-3374)
+<<<<<<< HEAD
+=======
+
+Our Orca logo we got here: http://www.vectorfree.com/jumping-orca
+It is licensed Creative Commons Attribution 3.0.
+See https://creativecommons.org/licenses/by/3.0/us/
+We changed the logo by stripping the colored background, inverting
+it and then rotating it some.
+
+Later we found that vectorfree.com image is not properly licensed.
+The original is owned by vectorportal.com. The original was
+relicensed so we could use it as Creative Commons Attribution 3.0.
+The license is bundled with the download available here:
+http://www.vectorportal.com/subcategory/205/KILLER-WHALE-FREE-VECTOR.eps/ifile/9136/detailtest.asp
+>>>>>>> be5631f... HBASE-14104 Add vectorportal.com to NOTICES.txt as src of our logo