Commit Graph
5023 Commits
Author SHA1 Message Date
Woonduk Kang 53b07d0932 Merge branch '#119_ui_bug_fix' of emeroad/pinpoint-opensource
from pull-request 259

* refs/heads/#119_ui_bug_fix:
  #119 fix copy right   - modify url yobi to GitHub
2014-12-17 17:13:25 +09:00
Jongho Moon 744e013d7a Merge branch 'master' of lioolli/pinpoint
from pull-request 260

* refs/heads/master:
  [#128] Enabled spring bean profiling by default
2014-12-17 17:04:04 +09:00
Jongho Moon 6732c49c52 [#128] Enabled spring bean profiling by default 2014-12-17 17:03:07 +09:00
Woonduk Kang a3ff6a7054 #119 fix copy right
- modify url yobi to GitHub
2014-12-17 16:07:47 +09:00
Woonduk Kang 3c11a605b8 Merge branch '#119_ui_bug_fix' of emeroad/pinpoint-opensource
from pull-request 258

* refs/heads/#119_ui_bug_fix:
  #119 remove arcus monitoring site
  #119 fix node.category for arcus monitoring site
  #119 change package name - tld, jsp
2014-12-17 14:26:52 +09:00
Woonduk Kang 6841ac2ee3 #119 remove arcus monitoring site 2014-12-17 14:03:06 +09:00
Woonduk Kang b3fd0d6ba4 #119 fix node.category for arcus monitoring site 2014-12-17 11:38:38 +09:00
Woonduk Kang e427274ced #119 change package name
- tld, jsp
2014-12-17 11:29:12 +09:00
Minwoo Jung 5826f23f35 Merge branch 'issue-121' of minwoo.jung/pinpointClone
from pull-request 257

* refs/heads/issue-121:
  [#121] abstract Alarm sms/email sender
2014-12-17 11:22:47 +09:00
Minwoo Jung 8b837c76f7 [#121] abstract Alarm sms/email sender 2014-12-17 11:22:02 +09:00
Hyun Jeong 1f0e6be5ee Merge branch 'hyungil.jeong/issue-119' of hyungil.jeong/pinpoint
from pull-request 256

* refs/heads/hyungil.jeong/issue-119:
  [#119] fixed a bug where cursors were not displaying in TransactionView
2014-12-16 17:32:57 +09:00
Woonduk Kang 3c8ad7241e Merge branch '#119_ui_bug_fix' of emeroad/pinpoint-opensource
from pull-request 255

* refs/heads/#119_ui_bug_fix:
  #119_filter_wizard_bug_fix  - scope:true, node, link cache disable
2014-12-16 17:32:09 +09:00
Woonduk Kang f73c47b78f #119_filter_wizard_bug_fix
- scope:true, node, link cache disable
2014-12-16 17:30:18 +09:00
Hyun Jeong 6b37700b91 [#119] fixed a bug where cursors were not displaying in TransactionView 2014-12-16 17:25:15 +09:00
Hyun Jeong 88c27f6aa1 Merge branch 'examples' of hyungil.jeong/pinpoint
from pull-request 254

* refs/heads/examples:
  [#123] configured webapp build directory for maven-war-plugin.
  [#123] removed local copies of Twitter Bootstrap.
2014-12-16 16:45:43 +09:00
Hyun Jeong 99214d59e4 [#123] configured webapp build directory for maven-war-plugin. 2014-12-16 16:43:39 +09:00
Hyun Jeong 1e74a5f8a6 [#123] removed local copies of Twitter Bootstrap. 2014-12-16 16:41:18 +09:00
Hyun Jeong 73e582a20f Merge branch 'examples' of hyungil.jeong/pinpoint
from pull-request 253

* refs/heads/examples:
  [#123] added initial code for testapp project.
2014-12-16 15:21:45 +09:00
Hyun Jeong c28693f667 [#123] added initial code for testapp project. 2014-12-16 15:21:22 +09:00
koo-taejin 0e6c1641c5 Merge branch 'master' of sunsh318/pinpoint
from pull-request 252

* refs/heads/master:
  improved validation in start script.
2014-12-16 14:59:23 +09:00
koo-taejin cb2dbe161a improved validation in start script. 2014-12-16 14:57:28 +09:00
Jongho Moon 75127e4a20 Merge branch 'master' of lioolli/pinpoint
from pull-request 251

* refs/heads/master:
  [#103] Implemented PreparedStatement methods for JDK 7 and above
2014-12-16 13:19:32 +09:00
Jongho Moon cc5079f81e [#103] Implemented PreparedStatement methods for JDK 7 and above 2014-12-16 13:19:02 +09:00
Woonduk Kang ffb4e76d36 Merge branch 'master' of emeroad/pinpoint-opensource
from pull-request 250

* refs/heads/master:
  #119_filter_wizard_bug_fix
2014-12-16 11:30:32 +09:00
Woonduk Kang a016324d1c #119_filter_wizard_bug_fix 2014-12-16 11:26:17 +09:00
koo-taejin 221250627a Merge branch 'examples' of hyungil.jeong/pinpoint
from pull-request 249

* refs/heads/examples:
2014-12-15 18:15:07 +09:00
Hyun Jeong d6a479b212 Merge branch 'examples' of hyungil.jeong/pinpoint
from pull-request 249

* refs/heads/examples:
  [#123] cleaned up startup scripts
  [#123] initialized testapp project
2014-12-15 18:15:00 +09:00
Hyun Jeong 2a44e4c6eb [#123] cleaned up startup scripts 2014-12-15 17:31:00 +09:00
Jaehong Kim 014b9f9bb8 Merge branch 'master' of kimjh008/pinpoint-open
from pull-request 248

* refs/heads/master:
  #124 fix go.js & amchart.js watermark
2014-12-15 17:24:53 +09:00
Jaehong Kim a326584428 #124 fix go.js & amchart.js watermark 2014-12-15 17:23:34 +09:00
Hyun Jeong 0d5df79317 [#123] initialized testapp project 2014-12-15 17:21:47 +09:00
koo-taejin c51f7e08bc Merge branch 'master' of sunsh318/pinpoint
from pull-request 247

* refs/heads/master:
  #123 Changed support for start collector in macos.
2014-12-15 17:17:26 +09:00
koo-taejin 92ceaef65e #123 Changed support for start collector in macos. 2014-12-15 17:16:30 +09:00
Hyun Jeong 4d13ba2433 Merge branch 'hyungil.jeong/issue-119' of hyungil.jeong/pinpoint
from pull-request 246

* refs/heads/hyungil.jeong/issue-119:
  [#119] added cpu load chart to Mixed View
2014-12-15 15:01:01 +09:00
Hyun Jeong 1eeaa32d0b [#119] added cpu load chart to Mixed View 2014-12-15 14:59:45 +09:00
koo-taejin b7754f444f Merge branch 'master' of http://yobi.navercorp.com/pinpoint/pinpoint 2014-12-15 11:13:22 +09:00
Hyun Jeong 895aee04b6 Merge branch 'examples' of hyungil.jeong/pinpoint
from pull-request 245

* refs/heads/examples:
  [#123] removed redundant install hbase script file
2014-12-15 10:31:05 +09:00
Hyun Jeong 8292dc50f1 [#123] removed redundant install hbase script file 2014-12-15 10:30:35 +09:00
koo-taejin f8d0a5b763 changed script permission. 2014-12-15 10:25:46 +09:00
Jongho Moon b656473337 Merge branch 'master' of lioolli/pinpoint
from pull-request 244

* refs/heads/master:
  [#131] Changed package name
2014-12-12 16:15:53 +09:00
Jongho Moon 8d5f6d223c [#131] Changed package name 2014-12-12 16:14:37 +09:00
Jongho Moon ce9d503445 Merge branch 'master' of lioolli/pinpoint
from pull-request 243

* refs/heads/master:
  [#122] Moved BLOC 3.x modifier to pinpoint-naver project
2014-12-12 16:03:49 +09:00
Jongho Moon 2c73096c9c [#122] Moved BLOC 3.x modifier to pinpoint-naver project 2014-12-12 15:59:15 +09:00
Hyun Jeong 0ec8c6c920 Merge branch 'examples' of hyungil.jeong/pinpoint
from pull-request 242

* refs/heads/examples:
  [#123] changed install-hbase.sh to start-hbase.sh
2014-12-12 10:39:18 +09:00
Hyun Jeong 82db1e3385 [#123] changed install-hbase.sh to start-hbase.sh 2014-12-12 10:38:22 +09:00
koo-taejin 1bcad5865a Merge branch 'master' of sunsh318/pinpoint
from pull-request 241

* refs/heads/master:
  #123 added added start and stop script for examples.
2014-12-12 10:04:03 +09:00
koo-taejin 20f0dfcb00 #123 added added start and stop script for examples. 2014-12-12 10:03:04 +09:00
Minwoo Jung 4bbf8d92ac [#103] Change properties config 2014-12-11 16:44:00 +09:00
Minwoo Jung a6e0e06cf2 [#103] Internal service static link change config way 2014-12-11 16:38:33 +09:00
Minwoo Jung 6a0519af54 [#103] Internal service static link change config way 2014-12-11 16:38:32 +09:00