Jaehong Kim 3ceb61496c Merge branch 'master' of https://github.com/naver/pinpoint into trace ...

Conflicts:
	plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java
	profiler/src/main/java/com/navercorp/pinpoint/profiler/context/DefaultTrace.java
	profiler/src/main/java/com/navercorp/pinpoint/profiler/context/DisableTrace.java
	profiler/src/main/java/com/navercorp/pinpoint/profiler/context/MetricTrace.java
	profiler/src/main/java/com/navercorp/pinpoint/profiler/context/ThreadLocalTraceFactory.java

2015-07-09 11:43:49 +09:00

..

main

change trace api.

2015-07-09 10:57:51 +09:00

test

#667 added jdk HttpURLConnection option

2015-06-29 15:30:22 +09:00