http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistModule.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistModule.java
 
b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistModule.java
index 35b0758..8c28e16 100644
--- 
a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistModule.java
+++ 
b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistModule.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java
 
b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java
index 2ffa3c0..68b20e1 100644
--- 
a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java
+++ 
b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/annotations/Experimental.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/annotations/Experimental.java 
b/ambari-server/src/main/java/org/apache/ambari/annotations/Experimental.java
index f51991c..12d21ba 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/annotations/Experimental.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/annotations/Experimental.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/annotations/ExperimentalFeature.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/annotations/ExperimentalFeature.java
 
b/ambari-server/src/main/java/org/apache/ambari/annotations/ExperimentalFeature.java
index 1d5ba0e..bccaaf0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/annotations/ExperimentalFeature.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/annotations/ExperimentalFeature.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/annotations/Markdown.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/annotations/Markdown.java 
b/ambari-server/src/main/java/org/apache/ambari/annotations/Markdown.java
index 8bcfd0f..370e0be 100644
--- a/ambari-server/src/main/java/org/apache/ambari/annotations/Markdown.java
+++ b/ambari-server/src/main/java/org/apache/ambari/annotations/Markdown.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/annotations/TransactionalLock.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/annotations/TransactionalLock.java
 
b/ambari-server/src/main/java/org/apache/ambari/annotations/TransactionalLock.java
index 7c8485c..a3f15fa 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/annotations/TransactionalLock.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/annotations/TransactionalLock.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/AmbariException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/AmbariException.java 
b/ambari-server/src/main/java/org/apache/ambari/server/AmbariException.java
index 2950533..812ea1e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/AmbariException.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/AmbariException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/AmbariService.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/AmbariService.java 
b/ambari-server/src/main/java/org/apache/ambari/server/AmbariService.java
index 86ad1cf..1c69f10 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/AmbariService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/AmbariService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/ClusterNotFoundException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ClusterNotFoundException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ClusterNotFoundException.java
index 62d0714..8148cc4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ClusterNotFoundException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ClusterNotFoundException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/ConfigGroupNotFoundException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ConfigGroupNotFoundException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ConfigGroupNotFoundException.java
index a397c96..15a2d99 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ConfigGroupNotFoundException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ConfigGroupNotFoundException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/DBConnectionVerification.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/DBConnectionVerification.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/DBConnectionVerification.java
index b980e35..b28e01c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/DBConnectionVerification.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/DBConnectionVerification.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/DuplicateResourceException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/DuplicateResourceException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/DuplicateResourceException.java
index 0e75a76..aeeb0b4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/DuplicateResourceException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/DuplicateResourceException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/EagerSingleton.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/EagerSingleton.java 
b/ambari-server/src/main/java/org/apache/ambari/server/EagerSingleton.java
index dde4143..8e1621e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/EagerSingleton.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/EagerSingleton.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/HostNotFoundException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/HostNotFoundException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/HostNotFoundException.java
index f5768c1..58654a6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/HostNotFoundException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/HostNotFoundException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
index 78ed4ef..19b13aa 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/ObjectNotFoundException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ObjectNotFoundException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ObjectNotFoundException.java
index 59063cb..75c9f3b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ObjectNotFoundException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ObjectNotFoundException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/ParentObjectNotFoundException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ParentObjectNotFoundException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ParentObjectNotFoundException.java
index 0674dda..15bd7cb 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ParentObjectNotFoundException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ParentObjectNotFoundException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/Role.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/Role.java 
b/ambari-server/src/main/java/org/apache/ambari/server/Role.java
index b32a909..c384e2e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/Role.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/Role.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/RoleCommand.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/RoleCommand.java 
b/ambari-server/src/main/java/org/apache/ambari/server/RoleCommand.java
index 2068e7e..7ae33eb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/RoleCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/RoleCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentHostNotFoundException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentHostNotFoundException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentHostNotFoundException.java
index 4c59665..c870b65 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentHostNotFoundException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentHostNotFoundException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
index 32f3505..8f25cb1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
index b98d733..6b18c09 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/StackAccessException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/StackAccessException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/StackAccessException.java
index 59a5633..b8bfff3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/StackAccessException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/StackAccessException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
index 26e5be8..826f2ca 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/StaticallyInject.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/StaticallyInject.java 
b/ambari-server/src/main/java/org/apache/ambari/server/StaticallyInject.java
index 053f437..ad793db 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/StaticallyInject.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/StaticallyInject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
index 47a74b2..b095a70 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
index 4b7e71d..982316d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
index 13cdce1..3182b50 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index d3157e2..e779f78 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionType.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionType.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionType.java
index 6a57ce1..3a03798 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionType.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperFactory.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperFactory.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperFactory.java
index 29ee709..02d1b23 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperFactory.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
index bd354d9..b236de4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleStatus.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleStatus.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleStatus.java
index 3656bfe..9685f83 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleStatus.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java
index baf67fe..eb4143f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java
@@ -84,10 +84,10 @@ public class Request {
   @Inject
   private static HostDAO hostDAO;
 
-  @AssistedInject
   /**
    * Construct new entity
    */
+  @AssistedInject
   public Request(@Assisted long requestId, @Assisted("clusterId") Long 
clusterId, Clusters clusters) {
     this.requestId = requestId;
     this.clusterId = clusterId.longValue();
@@ -107,10 +107,10 @@ public class Request {
     }
   }
 
-  @AssistedInject
   /**
    * Construct new entity from stages provided
    */
+  @AssistedInject
   //TODO remove when not needed
   public Request(@Assisted Collection<Stage> stages, @Assisted String 
clusterHostInfo, Clusters clusters){
     if (stages != null && !stages.isEmpty()) {
@@ -141,10 +141,10 @@ public class Request {
     }
   }
 
-  @AssistedInject
   /**
    * Construct new entity from stages provided
    */
+  @AssistedInject
   //TODO remove when not needed
   public Request(@Assisted Collection<Stage> stages, @Assisted String 
clusterHostInfo, @Assisted ExecuteActionRequest actionRequest,
                  Clusters clusters, Gson gson) throws AmbariException {
@@ -159,10 +159,10 @@ public class Request {
     }
   }
 
-  @AssistedInject
   /**
    * Load existing request from database
    */
+  @AssistedInject
   public Request(@Assisted RequestEntity entity, final StageFactory 
stageFactory, Clusters clusters){
     if (entity == null) {
       throw new RuntimeException("Request entity cannot be null.");

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/RequestStatus.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/RequestStatus.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/RequestStatus.java
index 181ab25..43cd1b1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/RequestStatus.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/RequestStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ServiceComponentHostEventWrapper.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ServiceComponentHostEventWrapper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ServiceComponentHostEventWrapper.java
index 83bee65..b9df962 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ServiceComponentHostEventWrapper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ServiceComponentHostEventWrapper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
index 5295536..ff67eea 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/TargetHostType.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/TargetHostType.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/TargetHostType.java
index c983859..2ab3c33 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/TargetHostType.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/TargetHostType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
index 8d05e4d..02f2dc8 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentCommand.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentCommand.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentCommand.java
index e2f013d..b0f1361 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java
index 92cdd58..02d227a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
index dc75512..5ff1564 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/AlertDefinitionCommand.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/AlertDefinitionCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/AlertDefinitionCommand.java
index 4d2e048..2929087 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/AlertDefinitionCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/AlertDefinitionCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/AlertExecutionCommand.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/AlertExecutionCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/AlertExecutionCommand.java
index b0781da..24356f8 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/AlertExecutionCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/AlertExecutionCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/CancelCommand.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/CancelCommand.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/CancelCommand.java
index 7aa24c8..2009d76 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/CancelCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/CancelCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java
index 2c20ae9..e63af7d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentRecoveryReport.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentRecoveryReport.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentRecoveryReport.java
index cf9272e..033043f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentRecoveryReport.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentRecoveryReport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentStatus.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentStatus.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentStatus.java
index 68e1734..b5af218 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentStatus.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentsResponse.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentsResponse.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentsResponse.java
index ed7753c..3581692 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentsResponse.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentsResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/DiskInfo.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/DiskInfo.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/DiskInfo.java
index 0f345b8..4a4adbd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/DiskInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/DiskInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
index 8c726a0..419cae4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java
index 7d5f78c..65486f0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index 3601528..a190252 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -227,11 +227,10 @@ public class HeartBeatHandler {
       return createRegisterCommand();
     }
 
-    /**
+    /*
      * A host can belong to only one cluster. Though 
getClustersForHost(hostname)
      * returns a set of clusters, it will have only one entry.
      *
-     *
      * TODO: Handle the case when a host is a part of multiple clusters.
      */
     Set<Cluster> clusters = clusterFsm.getClustersForHost(hostname);
@@ -444,7 +443,7 @@ public class HeartBeatHandler {
       LOG.debug("Agent configuration map set to " + response.getAgentConfig());
     }
 
-    /**
+    /*
      * A host can belong to only one cluster. Though 
getClustersForHost(hostname)
      * returns a set of clusters, it will have only one entry.
      *

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java
index 0cfc68d..667a6bf 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
index a77ed75..95f9b9e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
index c1028dc..6649f8a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
index d1e5dbc..ce16f14 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/HostStatus.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostStatus.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostStatus.java
index 2d021e9..0ac8dd2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostStatus.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfig.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfig.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfig.java
index 235da11..5dde26a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfig.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfigHelper.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfigHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfigHelper.java
index 9d5bae7d..6eff685 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfigHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfigHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -190,7 +190,7 @@ public class RecoveryConfigHelper {
       }
     }
     else if (event.getService() != null) {
-      /**
+      /*
        * Simply invalidate all the hosts in the cluster.
        * The recovery config will be sent to all the hosts
        * even if some of the hosts do not have components

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java
index 47af7c1..f3cf45a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
index a571afd..ec41a7b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationCommand.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationCommand.java
index c6aa28c..d034d2d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
index 8efefde..8fde98e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationStatus.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationStatus.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationStatus.java
index bc52827..a00b5ee 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationStatus.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
index 9c17e00..e8c0b05 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
index 120fab5..0690f7b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
index 41be01e..b42a290 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/alerts/AlertRunnable.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AlertRunnable.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AlertRunnable.java
index 057a273..3d7d3c7 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AlertRunnable.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AlertRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnable.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnable.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnable.java
index a35e6fd..1289622 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnable.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/alerts/ComponentVersionAlertRunnable.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/alerts/ComponentVersionAlertRunnable.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/alerts/ComponentVersionAlertRunnable.java
index 7dfbe47..174b5f6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/alerts/ComponentVersionAlertRunnable.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/alerts/ComponentVersionAlertRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -192,4 +192,4 @@ public class ComponentVersionAlertRunnable extends 
AlertRunnable {
 
     return Collections.singletonList(buildAlert(cluster, myDefinition, 
alertState, alertText));
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
index 503ad92..4f89eaa 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/GsonJsonProvider.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/GsonJsonProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/GsonJsonProvider.java
index 8b9ddee..b82771d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/GsonJsonProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/GsonJsonProvider.java
@@ -80,10 +80,10 @@ public class GsonJsonProvider implements 
MessageBodyReader<Object>,
     return true;
   }
 
-  @Override
   /**
    * Not known
    */
+  @Override
   public long getSize(Object o, Class<?> type, Type genericType, Annotation[] 
annotations, MediaType mediaType) {
     return -1;
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/UserNameOverrideFilter.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/UserNameOverrideFilter.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/UserNameOverrideFilter.java
index 04de12c..09ffc17 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/UserNameOverrideFilter.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/UserNameOverrideFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
index 366ff13..d0bd5d3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
index 069baa0..549da76 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java
index 96dab1c..f0314e1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java
index 40bac90..34d482c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java
index 947289e..077c1cc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/RequestHandler.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/RequestHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/RequestHandler.java
index 1c7a220..26c3ebb 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/RequestHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/RequestHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java
index 7f6a484..d0c11f2 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/InvalidQueryException.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/InvalidQueryException.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/InvalidQueryException.java
index e2426d4..b2d3cab 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/InvalidQueryException.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/InvalidQueryException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java
index 2282c6f..afafccb 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java
index afea2d3..a9ab185 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -206,9 +206,7 @@ public class QueryLexer {
     return Pattern.compile(sb.toString());
   }
 
-  /**
-   * Add property names that the lexer should ignore.
-   */
+  // Add property names that the lexer should ignore.
   static {
     // ignore values
     SET_IGNORE.add(QUERY_FIELDS);

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
index 14cf398..3ce0958 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/Token.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/Token.java 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/Token.java
index 3063f2b..e812dd9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/Token.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/Token.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java
index 2c647aa..1fd6bce 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java
index 6412799..7bd3ce1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java
index 08fbd75..b519c07 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpressionFactory.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpressionFactory.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpressionFactory.java
index 283d135..2f107b5 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpressionFactory.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpressionFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java
index faadd00..e7bb60c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/RelationalExpression.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/RelationalExpression.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/RelationalExpression.java
index 09d57a0..d1ccc96 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/RelationalExpression.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/RelationalExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AbstractOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AbstractOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AbstractOperator.java
index 82ad21b..7f0eacd 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AbstractOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AbstractOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AndOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AndOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AndOperator.java
index 577a147..bbde71f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AndOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AndOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java
index 688e2d9..42b71a1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/FilterOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/FilterOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/FilterOperator.java
index b4f0f65..b310b95 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/FilterOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/FilterOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java
index c7ea1ae..6a133dc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java
index 05cb695..290e1ea 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
index 6b56a59..75ae5de 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperator.java
index f43a619..e354594 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java
index cffe382..be7d491 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java
index 374e31c..b16e660 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperator.java
index 80e9a69..e5877aa 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2409e74/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperatorFactory.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperatorFactory.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperatorFactory.java
index fb12075..27bf0df 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperatorFactory.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperatorFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

Reply via email to