Jaehong Kim
cdbf9d2a67
Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint
...
Conflicts:
commons/compile.txt
2014-09-25 13:31:24 +09:00
Jaehong Kim
9e0e90e40a
#7 fix comment & try catched unexpected exception
2014-09-25 11:53:52 +09:00
Woonduk Kang
05d19d0b93
add target dir
2014-09-25 11:39:11 +09:00
Woonduk Kang
9cd47e7338
[ #23 ] fix maven warning message
2014-09-25 11:25:12 +09:00
Jaehong Kim
8aad79ba89
Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint
...
Conflicts:
bootstrap/src/main/java/com/nhn/pinpoint/bootstrap/config/ProfilerConfig.java
bootstrap/src/main/java/com/nhn/pinpoint/bootstrap/interceptor/InterceptorRegistry.java
profiler/src/main/java/com/nhn/pinpoint/profiler/modifier/DefaultModifierRegistry.java
testweb/src/main/resources/applicationContext-testweb.xml
2014-09-24 19:36:23 +09:00
Jaehong Kim
605755ca66
#7 need merge ...
2014-09-24 18:57:35 +09:00
Woonduk Kang
3b17dc6f90
code cleanup : remove deprecated testcase, remove Sys.out
2014-09-24 18:06:05 +09:00
Woonduk Kang
322fa14393
#21 increase max & fix bug - size compare logic
2014-09-24 16:18:21 +09:00
Jaehong Kim
f6a0aedccd
#7 redis&nBase-ARC interceptor
2014-09-23 14:16:22 +09:00
Hyun Jeong
b8ac48a330
Merge branch 'hyungil.jeong/issue-14' of hyungil.jeong/pinpoint
...
from pull-request 10
* refs/heads/hyungil.jeong/issue-14:
[#14 ] Modified LifeCycleEventListener to directly check Agent's status.
[#14 ] Changed Tomcat start event hook to when StandardService starts.
2014-09-22 10:15:12 +09:00
Hyun Jeong
67de78768f
Merge branch 'hyungil.jeong/issue-4' of hyungil.jeong/pinpoint
...
from pull-request 4
* refs/heads/hyungil.jeong/issue-4:
[#4 ] Added StandardHostValveInvokeModifier root span trace test.
[#4 ] Add support for RootSpan tracing to test modifier/interceptors.
2014-09-22 10:15:05 +09:00
Hyun Jeong
138951c8e4
[ #14 ] Modified LifeCycleEventListener to directly check Agent's status.
2014-09-18 18:39:12 +09:00
Woonduk Kang
9f6939c285
[ #10 ] support jtds driver(ms sqlserver)
2014-09-18 18:38:40 +09:00
Woonduk Kang
b4d75be433
[ #3 ] rollback pinpoint-version property
2014-09-01 14:48:51 +09:00
Woonduk Kang
d2811ca846
#3 add pinpoint-version property, change log4j scope->compile,
2014-08-29 15:37:03 +09:00
Woonduk Kang
50620b6da1
Merge branch 'master' of lioolli/pinpoint
...
from pull-request 1
* refs/heads/master:
[NO-BTS] correct jsp tag library xsd file version and location.
[#2 ] remove NetworkUtilsTest.testGetMachineName__getHostName() * If getHostName() fails because of UnknownHostException, call getMachineName()
2014-08-29 14:09:20 +09:00
Hyun Jeong
7da8cc05c5
[ #4 ] Add support for RootSpan tracing to test modifier/interceptors.
2014-08-29 12:56:52 +09:00
Hyun Jeong
57b0c583d3
[ #3 ] Change Pinpoint versions to 1.0.3-SNAPSHOT.
2014-08-28 19:18:56 +09:00
Jongho Moon
40a35e5ec5
[ #2 ] remove NetworkUtilsTest.testGetMachineName__getHostName()
...
* If getHostName() fails because of UnknownHostException, call
getMachineName()
2014-08-28 16:52:30 +09:00
Jongho Moon
6f9b181081
[ #1 ] merge pinpoint projects and convert to maven multi module project
2014-08-27 18:45:10 +09:00
Jongho Moon
4d7e3966b9
merge bootstrap
2014-08-27 17:49:43 +09:00