[01/18] phoenix git commit: PHOENIX-2186 Creating backend services for the Phoenix Tracing Web App (Nishani)

2015-09-10 Thread ndimiduk
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 c1b829086 -> 67628f78c PHOENIX-2186 Creating backend services for the Phoenix Tracing Web App (Nishani) Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit:

[01/18] phoenix git commit: PHOENIX-2186 Creating backend services for the Phoenix Tracing Web App (Nishani)

2015-09-10 Thread ndimiduk
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 8f3cd25e3 -> 8e27399c0 PHOENIX-2186 Creating backend services for the Phoenix Tracing Web App (Nishani) Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: