Merge pull request #581 from youyong205/master

modify the version

cat-agent/pom.xml

@@ -3,7 +3,7 @@
    <parent>
       <groupId>com.dianping.cat</groupId>
       <artifactId>parent</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.4</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>cat-agent</artifactId>

cat-broker/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1.3</version>
+		<version>1.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>broker-service</artifactId>

cat-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1.3</version>
+		<version>1.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-client</artifactId>

cat-client/src/main/java/com/dianping/cat/servlet/CatFilter.java

@@ -272,6 +272,7 @@ public class CatFilter implements Filter {
 
 			private void customizeStatus(Transaction t, HttpServletRequest req) {
 				Object catStatus = req.getAttribute(CatConstants.CAT_STATE);
+				
 				if (catStatus != null) {
 					t.setStatus(catStatus.toString());
 				} else {
@@ -281,6 +282,7 @@ public class CatFilter implements Filter {
 
 			private void customizeUri(Transaction t, HttpServletRequest req) {
 				Object catPageUri = req.getAttribute(CatConstants.CAT_PAGE_URI);
+				
 				if (t instanceof DefaultTransaction && catPageUri instanceof String) {
 					((DefaultTransaction) t).setName(catPageUri.toString());
 				}

cat-consumer-advanced/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1.3</version>
+		<version>1.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-consumer-advanced</artifactId>

cat-consumer/pom.xml

@@ -3,7 +3,7 @@
    <parent>
       <groupId>com.dianping.cat</groupId>
       <artifactId>parent</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.4</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>cat-consumer</artifactId>

cat-core/pom.xml

@@ -3,7 +3,7 @@
    <parent>
       <groupId>com.dianping.cat</groupId>
       <artifactId>parent</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.4</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>cat-core</artifactId>

cat-hadoop/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1.3</version>
+		<version>1.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-hadoop</artifactId>

cat-home/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1.3</version>
+		<version>1.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-home</artifactId>

cat-home/src/main/webapp/css/body.css

@@ -270,4 +270,8 @@ ul, ol{
 }
 .aleration_workflow{
 	background:#87CEEB;
+}
+.table-condensed th, .table-condensed td{
+padding: 2px 3px;
+vertical-align:middle;
 }
\ No newline at end of file

cat-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1.3</version>
+		<version>1.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-maven-plugin</artifactId>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.dianping.cat</groupId>
 	<artifactId>parent</artifactId>
-	<version>1.1.3</version>
+	<version>1.1.4</version>
 	<name>parent</name>
 	<description>Central Application Tracking</description>
 	<packaging>pom</packaging>
@@ -179,7 +179,7 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 			<plugin>
 				<groupId>com.dianping.cat</groupId>
 				<artifactId>cat-maven-plugin</artifactId>
-				<version>1.1.3</version>
+				<version>1.1.4</version>
 			</plugin>
 		</plugins>
 	</build>