Commit Graph
404 Commits
Author SHA1 Message Date
HyoJong cc0626c6a0 Merge pull request #554 from denzelsN/master
Update goJS
2015-06-05 17:29:08 +09:00
denz 8a27b35afe Update goJS
1.3.9 -> 1.4.27
2015-06-05 17:28:15 +09:00
Woonduk Kang 04fd8272e1 Merge branch 'master' of https://github.com/naver/pinpoint into #377_support_depth-limited-search 2015-06-05 16:29:50 +09:00
Woonduk Kang dc84358492 #377 support depth-limited search
- add testcase
2015-06-05 16:29:14 +09:00
Jaehong Kim 7d0ac14349 if not found destination id then set default value of Unknown 2015-06-05 14:50:53 +09:00
Jongho Moon 5e8d6a72a0 Merge pull request #546 from lioolli/master
makes pinpoint-web builds jar too
2015-06-05 11:49:49 +09:00
Jaehong Kim 1d0c4cace2 Merge branch 'master' of https://github.com/naver/pinpoint into user_include
Conflicts:
	plugins/pom.xml
2015-06-05 11:15:22 +09:00
Jaehong Kim bff4efdb7e add user include plugin 2015-06-04 15:27:03 +09:00
Jongho Moon 7c283079d6 makes pinpoint-web builds jar too 2015-06-04 14:50:50 +09:00
HyoJong b622926846 Merge pull request #545 from denzelsN/master
bug fix.
2015-06-04 14:34:48 +09:00
denz 42f7093172 bug fix. 2015-06-04 14:33:49 +09:00
HyoJong 30a225f757 Merge pull request #544 from denzelsN/master
Bug fix.
2015-06-04 11:52:31 +09:00
denz 303a32fecc Bug fix.
Update error display format
2015-06-04 11:51:18 +09:00
HyoJong 90eadc063e Merge pull request #542 from denzelsN/master
Update error display format (2)
2015-06-04 11:47:36 +09:00
denz afa6715203 Update error display format (2) 2015-06-04 11:46:57 +09:00
Woonduk Kang 0182ecce54 Merge branch 'master' of https://github.com/naver/pinpoint into #377_support_depth-limited-search 2015-06-04 11:20:38 +09:00
HyoJong 05d8183659 Merge pull request #541 from denzelsN/master
Update error display format
2015-06-04 11:13:51 +09:00
denz 136da734f0 Update error display format 2015-06-04 11:12:31 +09:00
Woonduk Kang 7c544bedd1 Merge branch 'master' of https://github.com/naver/pinpoint into #377_support_depth-limited-search 2015-06-04 11:02:02 +09:00
Woonduk Kang 212dfb2f5b #377 support depth-limited search
- add testcase
2015-06-04 11:01:23 +09:00
koo.taejin 9b80041899 #535 Shows detail error message when web controller meets any exception. 2015-06-03 15:39:32 +09:00
HyunGil Jeong 3b5ed69db5 resolved static analysis warnings 2015-06-02 16:38:38 +09:00
Woonduk Kang b9df65cb5a #377 support depth-limited search
- DEFAULT_SEARCH_DEPTH = "8"
2015-06-02 16:09:28 +09:00
HyoJong ef19f3143e Merge pull request #522 from denzelsN/master
When open transactionList page if opener page closed, move to opener …
2015-06-02 10:48:08 +09:00
denz 954538966d When open transactionList page if opener page closed, move to opener url page. 2015-06-02 10:45:08 +09:00
Woonduk Kang 5a6cdc6913 Merge pull request #516 from emeroad/master
modify pom.xml for CI
2015-06-01 15:38:58 +09:00
Woonduk Kang 49eb7e6dc0 modify pom.xml for CI
- change tomcat plugin version
2015-06-01 15:38:03 +09:00
HyoJong 7bbe63ec4a Merge pull request #512 from denzelsN/master
Improvement loading status
2015-06-01 15:00:30 +09:00
denz 9b29d13f4e Improvement loading status 2015-06-01 14:45:14 +09:00
HyoJong 2302ce07d5 Merge pull request #507 from denzelsN/master
bug fix.
2015-06-01 11:20:49 +09:00
denz 3677699b56 bug fix.
From string to Date conversion error in IE.
2015-06-01 11:19:12 +09:00
HyoJong dbeca274b7 Merge pull request #504 from denzelsN/master
Remove duplicated help template code.
2015-05-29 18:45:53 +09:00
denz 3e0a2b4c02 Remove duplicated help template code.
missing file
2015-05-29 18:44:27 +09:00
HyoJong 6d6d6f5b67 Merge pull request #501 from denzelsN/master
Remove duplicated help template code.
2015-05-29 18:14:11 +09:00
denz 427a617cc5 Remove duplicated help template code. 2015-05-29 18:12:27 +09:00
HyoJong 8edfd23cf9 Merge pull request #500 from denzelsN/master
bug fix.
2015-05-29 17:47:35 +09:00
denz db504def89 bug fix. 2015-05-29 17:47:10 +09:00
HyoJong 2561081cc8 Merge pull request #498 from denzelsN/master
Improvement Help page
2015-05-29 15:56:53 +09:00
denz 8f5c0d90eb Improvement Help page 2015-05-29 15:56:01 +09:00
Jongho Moon 47517674d4 Merge remote-tracking branch 'pavian/remove_complie_warning' into #467
Conflicts:
	web/src/main/java/com/navercorp/pinpoint/web/mapper/AgentInfoMapper.java
	web/src/main/java/com/navercorp/pinpoint/web/mapper/MapStatisticsCallerMapper.java
	web/src/main/java/com/navercorp/pinpoint/web/mapper/TraceIndexScatterMapper.java
	web/src/main/java/com/navercorp/pinpoint/web/mapper/TraceIndexScatterMapper2.java
	web/src/main/java/com/navercorp/pinpoint/web/util/KeyValueUtils.java
2015-05-29 10:51:21 +09:00
HyunGil Jeong bb65435ffb #488 added checks to filtering for NPE fix and RPC internal methods 2015-05-28 18:50:17 +09:00
Woonduk Kang ebcf98dc31 #320 change htablePool api
- hbase timeout option
 - hbase thread pool option
2015-05-28 17:00:07 +09:00
Woonduk Kang e2da730f6c #320 change htablePool api
- hbase timeout option
 - hbase thread pool option
2015-05-28 16:58:17 +09:00
HyoJong 817dfde81f Merge pull request #484 from denzelsN/master
bug fix.
2015-05-27 18:23:02 +09:00
denz 60b0ac7368 bug fix. 2015-05-27 18:19:46 +09:00
Minwoo Jung c37f4c75b3 Merge pull request #483 from minwoo-jung/issue-382
[#477] change properties config in pom.xml
2015-05-27 17:00:09 +09:00
Minwoo Jung 149f15946d [#477] change properties config in pom.xml 2015-05-27 16:58:23 +09:00
Woonduk Kang af90ccab62 #472 change hbase 1.0 api 2015-05-27 16:57:27 +09:00
Woonduk Kang 0274ec96d2 #472 change hbase 1.0 api 2015-05-27 15:30:39 +09:00
Woonduk Kang 57e631de46 #472 change hbase 1.0 api 2015-05-27 14:39:13 +09:00