Fixes minor issues with merge conflicts. Contributed by Venkatesh Seetharam

InstallationSteps.txt

@@ -96,7 +96,8 @@ c. Using Falcon
 
   curl -v http://localhost:21000/api/metadata/entities/list/hive_database
 
-
+* Search for entities (instances) in the repository
+  curl -v http://localhost:21000/api/metadata/discovery/search/dsl?query="from hive_table"
 
 d. Stopping Falcon Server
 ~~~~~~~~~~~~~~~~~~~~~~~~~

dashboard/dashboard-v2/public/modules/notification/views/notifications.html

-<div class="container" data-ng-controller="NotificationController">
-    <alert data-ng-repeat="notification in getNotifications()" data-type="{{notification.type}}" data-close="close(notification)">
-        {{notification.message}}
-    </alert>
-</div>
\ No newline at end of file

dashboard/v2/public/modules/notification/views/notifications.html

@@ -16,8 +16,8 @@
   ~ limitations under the License.
   -->
 
-<div data-ng-controller="NotificationController">
+<div class="container" data-ng-controller="NotificationController">
     <alert data-ng-repeat="notification in getNotifications()" data-type="{{notification.type}}" data-close="close(notification)">
         {{notification.message}}
     </alert>
-</div>
+</div>
\ No newline at end of file

typesystem/src/test/java/org/apache/hadoop/metadata/typesystem/types/store/HdfsStoreTest.java

@@ -33,6 +33,7 @@ import org.apache.hadoop.metadata.typesystem.types.HierarchicalTypeDefinition;
 import org.apache.hadoop.metadata.typesystem.types.StructTypeDefinition;
 import org.apache.hadoop.metadata.typesystem.types.TraitType;
 import org.apache.hadoop.metadata.typesystem.types.TypeSystem;
+import org.apache.hadoop.metadata.typesystem.types.utils.TypesUtil;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -51,7 +52,7 @@ public class HdfsStoreTest extends BaseTest {
 
         //define type system
         HierarchicalTypeDefinition<TraitType> tagTypeDefinition =
-                createTraitTypeDef("tag",
+                TypesUtil.createTraitTypeDef("tag",
                         ImmutableList.<String>of(),
                         createRequiredAttrDef("level", DataTypes.INT_TYPE));
         HierarchicalTypeDefinition<ClassType> databaseTypeDefinition =
@@ -59,7 +60,7 @@ public class HdfsStoreTest extends BaseTest {
                         ImmutableList.<String>of(),
                         createRequiredAttrDef("name", DataTypes.STRING_TYPE),
                         createRequiredAttrDef("description", DataTypes.STRING_TYPE),
-                        createRequiredAttrDef("tag", "tag"));
+                        createRequiredAttrDef("tag", DataTypes.STRING_TYPE));
         TypeSystem.getInstance().defineTypes(
                 ImmutableList.<StructTypeDefinition>of(),
                 ImmutableList.of(tagTypeDefinition),