home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-16 16:28:48 +10:00
Code Issues Packages Projects Releases Wiki Activity
4,754 Commits 5 Branches 14 Tags
00a3fcb06afac6aafa7b0b89b0795a0e505fcabc
Commit Graph
4754 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaehong Kim 00a3fcb06a #28 code merge 2014-11-11 14:37:48 +09:00
Jaehong Kim c10793ff95 Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint into is28 
Conflicts:
	collector/src/main/java/com/nhn/pinpoint/collector/receiver/udp/UDPReceiver.java
 2014-11-11 14:36:18 +09:00
Hyun Jeong ceec170560 Merge branch 'hyungil.jeong/issue-84' of hyungil.jeong/pinpoint 
from pull-request 137

* refs/heads/hyungil.jeong/issue-84:
  [#84] updated version to 1.0.4-SNAPSHOT
 2014-11-10 18:33:52 +09:00
Hyun Jeong 7165f472a6 [#84] updated version to 1.0.4-SNAPSHOT 2014-11-10 18:32:15 +09:00
Hyun Jeong dc52e5c552 Merge branch 'hyungil.jeong/issue-83' of hyungil.jeong/pinpoint 
from pull-request 136

* refs/heads/hyungil.jeong/issue-83:
  [#83] modified margins for charts and removed unnecessary event emission
 2014-11-10 18:20:15 +09:00
Hyun Jeong f897b7c41b [#83] modified margins for charts and removed unnecessary event emission 2014-11-10 18:19:05 +09:00
koo-taejin b0101a0019 Merge branch 'cluster' of sunsh318/pinpoint-2 
from pull-request 135

* refs/heads/cluster:
  #5 Pinpoint 클러스터 개발
 2014-11-10 16:33:42 +09:00
koo-taejin d688decadc #5 Pinpoint 클러스터 개발 
1. collector cluster class명 변경
ClusterPoint -> Cluster 
(ClusterPoint (각 연결을 뜻하게 변경)

2. 구조 변경
 2014-11-10 16:31:20 +09:00
Jaehong Kim 42ef4fc708 #28 refactoring 2014-11-07 16:45:57 +09:00
koo-taejin eba0ab4476 Merge branch 'master' of sunsh318/pinpoint-2 
from pull-request 134

* refs/heads/master:
  [NoIssue] Serialization 중복 코드 제거
 2014-11-07 11:49:24 +09:00
koo-taejin ca1023ac40 [NoIssue] Serialization 중복 코드 제거 
SerializationUtils 를 사용하게 변경
 2014-11-07 11:48:19 +09:00
Woonduk Kang ae74eb5e25 Merge branch '#71_add_api_getSuperClass&getInterfaces' of emeroad/pinpoint 
from pull-request 133

* refs/heads/#71_add_api_getSuperClass&getInterfaces:
  [#67] add api(getSuperClass(), String[] getInterfaces()), improvement api JavaAssistUtils
 2014-11-06 19:15:27 +09:00
Woonduk Kang aa32a6fa09 [#67] add api(getSuperClass(), String[] getInterfaces()), improvement api JavaAssistUtils 2014-11-06 19:11:25 +09:00
Woonduk Kang b4e0b1ad2d Merge branch '#67-patch_getDeclaredMethod' of emeroad/pinpoint 
from pull-request 132

* refs/heads/#67-patch_getDeclaredMethod:
  [#67] fix correct Name, MethodInfo ->Method
 2014-11-06 11:11:54 +09:00
Woonduk Kang 2056b44f23 [#67] fix correct Name, MethodInfo ->Method 2014-11-05 19:14:37 +09:00
Jaehong Kim bd03dfadae #28 change class 2014-11-05 18:59:28 +09:00
Woonduk Kang 15b6e3bb15 Merge branch '#67-patch_getDeclaredMethod' of emeroad/pinpoint 
from pull-request 131

* refs/heads/#67-patch_getDeclaredMethod:
  [#67] merge 1.0.3, remove tab
  [#67] remove proguard
  [#67] remove tab
 2014-11-05 18:42:26 +09:00
Woonduk Kang 6c583a7976 [#67] merge 1.0.3, remove tab 2014-11-05 18:38:24 +09:00
Minwoo Jung b0c86a7b1b [#75] clover license problem 2014-11-04 17:43:36 +09:00
Minwoo Jung d8c875006c [#75] clover license problem 2014-11-04 17:25:40 +09:00
Woonduk Kang c825c695a9 [#67] remove proguard 2014-11-04 11:06:13 +09:00
Woonduk Kang 23dd5cf54a [#67] remove tab 2014-11-04 11:01:01 +09:00
Hyun Jeong 7e197811c1 Merge branch 'hyungil.jeong/issue-32' of hyungil.jeong/pinpoint 
from pull-request 130

* refs/heads/hyungil.jeong/issue-32:
  [#32] corrected ng tags for server meta data
 2014-11-04 10:39:48 +09:00
Hyun Jeong 374dc50a27 [#32] corrected ng tags for server meta data 2014-11-04 10:38:18 +09:00
Woonduk Kang 95f67fcbe6 Merge branch '#67-patch_getDeclaredMethod' of emeroad/pinpoint 
from pull-request 128

* refs/heads/#67-patch_getDeclaredMethod:
  [#67] patch 1.0.3
 2014-11-03 19:48:26 +09:00
Woonduk Kang 255c9628be [#67] patch 1.0.3 2014-11-03 19:46:58 +09:00
Jaehong Kim 99aa369e07 Merge branch 'master' of kimjh008/pinpoint 
from pull-request 127

* refs/heads/master:
  #70 remove unused code
  #70 redis&nBase-ARC interceptor master merge
  Merge commit 'e337411e0a98d8bd2c2d577d6b04457905b260b2'
  Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint
  #7 add super class interceptor
  Merge branch '1.0.3'
  Merge branch '1.0.3' of kimjh008/pinpoint
  #70 redis&nBase-ARC interceptor
  Merge branch '#67_add_api_getDeclaredMethodsForce' of emeroad/pinpoint
  [#67] add api getDeclaredMethodsForce
  [#58] change collector server domain address (nhncorp.com -> navercorp.com)
  Merge branch '1.0.3' of kimjh008/pinpoint
  #65 add chkLibrary
  Merge branch 'master' of pinpoint/pinpoint
 2014-11-03 18:24:17 +09:00
Jaehong Kim 11b1b89b25 #70 remove unused code 2014-11-03 18:14:49 +09:00
Jaehong Kim 6959efb24e #70 redis&nBase-ARC interceptor master merge 2014-11-03 18:11:44 +09:00
Jaehong Kim 8f6f77fb73 Merge commit 'e337411e0a98d8bd2c2d577d6b04457905b260b2' 2014-11-03 17:42:27 +09:00
Jaehong Kim 0dea3a4268 Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint 2014-11-03 17:38:20 +09:00
Minwoo Jung 139f9aa996 Merge branch 'issue-39' of minwoo.jung/pinpoint 
from pull-request 125

* refs/heads/issue-39:
  [#39] edit import package name
 2014-11-03 16:55:34 +09:00
Minwoo Jung 05c5f4c529 [#39] edit import package name 2014-11-03 16:54:36 +09:00
Jaehong Kim 8b7ea29f46 #28 fix deserializer 2014-11-03 15:32:29 +09:00
Minwoo Jung 0c66f23d57 Merge branch 'issue-39' of minwoo.jung/pinpoint 
from pull-request 122

* refs/heads/issue-39:
  [#39] Add test code
  [#39] Add method profiler for retry count when http call
 2014-11-03 15:23:40 +09:00
Minwoo Jung 4d458e3578 [#39] Add test code 2014-11-03 15:21:19 +09:00
Minwoo Jung e136ddcbb3 [#39] Add method profiler for retry count when http call 2014-11-03 15:21:17 +09:00
Jaehong Kim 0be7bab604 Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint into is28 2014-11-03 14:49:18 +09:00
Jaehong Kim 84f8903df5 #7 add super class interceptor 2014-11-03 11:27:01 +09:00
Jaehong Kim 3446fbbb1e Merge branch '1.0.3' 
Conflicts:
	bootstrap/src/main/java/com/nhn/pinpoint/bootstrap/instrument/InstrumentClass.java
	profiler/src/main/java/com/nhn/pinpoint/profiler/interceptor/bci/JavaAssistClass.java
	profiler/src/main/java/com/nhn/pinpoint/profiler/modifier/redis/JedisModifier.java
	profiler/src/main/java/com/nhn/pinpoint/profiler/modifier/redis/JedisPipelineModifier.java
	profiler/src/main/java/com/nhn/pinpoint/profiler/modifier/redis/RedisClusterModifier.java
	profiler/src/main/java/com/nhn/pinpoint/profiler/modifier/redis/RedisClusterPipelineModifier.java
 2014-11-03 10:46:30 +09:00
Jaehong Kim 2ce83eeb3f Merge branch '1.0.3' of kimjh008/pinpoint 
from pull-request 119

* refs/heads/1.0.3:
  #70 redis&nBase-ARC interceptor
 2014-11-03 10:38:46 +09:00
Jaehong Kim 9f8c518ccd #70 redis&nBase-ARC interceptor 2014-11-03 10:32:07 +09:00
Woonduk Kang cec2ac433b Merge branch '#67_add_api_getDeclaredMethodsForce' of emeroad/pinpoint 
from pull-request 118

* refs/heads/#67_add_api_getDeclaredMethodsForce:
  [#67] add api getDeclaredMethodsForce
 2014-10-31 16:50:14 +09:00
Woonduk Kang dfa756ecc9 [#67] add api getDeclaredMethodsForce 2014-10-31 16:49:10 +09:00
Minwoo Jung cc04864ebd [#58] change collector server domain address (nhncorp.com -> 
navercorp.com)
 2014-10-31 16:01:49 +09:00
Minwoo Jung 63c31d1343 [#58] change collector server domain address 
(nhncorp.com -> navercorp.com)
 2014-10-31 15:59:19 +09:00
Jaehong Kim cea27fafe5 #28 fix test case 2014-10-30 18:39:54 +09:00
koo-taejin 0beff1555c Merge branch 'master' of sunsh318/pinpoint-2 
from pull-request 117

* refs/heads/master:
  #5 Pinpoint 클러스터 개발
 2014-10-30 16:08:01 +09:00
koo-taejin b2a39d04fd #5 Pinpoint 클러스터 개발 
1. class명 변경 
2. CommandDispatcher 생성 방법을 변경
 2014-10-30 16:06:37 +09:00
koo-taejin b6b988d836 Merge branch '1.0.3' of kimjh008/pinpoint 
from pull-request 116

* refs/heads/1.0.3:
  #65 add chkLibrary
 2014-10-30 13:44:32 +09:00