Commit Graph
8096 Commits
Author SHA1 Message Date
denz 4439efa850 update alarm ui 2016-04-27 17:09:43 +09:00
HyoJong 744b8726d0 Merge pull request #1724 from minwoo-jung/issue-1723
Issue 1723
2016-04-27 16:35:44 +09:00
Minwoo Jung 2ea01d195b [#1723] User select API was changed searching logic 2016-04-27 16:19:09 +09:00
Minwoo Jung 779e548086 [#1723] Userselect API was added ordering logic. 2016-04-27 16:19:07 +09:00
Minwoo Jung 5cbe273d33 [#1723] User select API was changed searching logic 2016-04-27 16:19:05 +09:00
Woonduk Kang 51480975a7 Merge pull request #1722 from emeroad/TraceV2/#1720_package_name_chage
#1720 Package name change of the server module
2016-04-27 13:51:42 +09:00
emeroad 17dd812225 #1720 Package name change of the server module
- remove com.navercorp.pinpoint.common.bo package
2016-04-27 13:50:40 +09:00
Woonduk Kang 687fe2342d Merge pull request #1721 from emeroad/TraceV2/#1720_package_name_chage
#1720 Package name change of the server module
2016-04-27 12:03:56 +09:00
emeroad 5fd77b6828 #1720 Package name change of the server module
- com.navercorp.pinpoint.common -> com.navercorp.pinpoint.common.server
2016-04-27 11:43:35 +09:00
Woonduk Kang 7362bee2d4 Merge pull request #1718 from koo-taejin/#1711
Added UdpDataSender using NIO #1711
2016-04-26 18:53:37 +09:00
HyoJong a6e497cc7d Merge pull request #1719 from denzelsN/master
bug fix
2016-04-26 18:15:49 +09:00
denz 64b2f2b996 bug fix
- JSON parse error of preference.favorite
2016-04-26 18:11:26 +09:00
koo.taejin 590694b0e4 Added UdpDataSender using NIO #1711
added NioUdpDataSender
2016-04-26 17:59:49 +09:00
HyoJong c293c90147 Merge pull request #1716 from denzelsN/master
remove test code
2016-04-26 17:13:09 +09:00
denz d447e4eb8c remove test code 2016-04-26 17:12:39 +09:00
HyoJong a82950e95d Merge pull request #1715 from denzelsN/master
update alarm ui and fix bug
2016-04-26 17:03:10 +09:00
denz de1a27751f update alarm ui and fix bug 2016-04-26 17:00:44 +09:00
Woonduk Kang a56a1c2b21 Merge pull request #1712 from koo-taejin/#1711
Added UdpDataSender using NIO #1711
2016-04-25 11:45:18 +09:00
koo.taejin 33a69ed663 Added UdpDataSender using NIO #1711
added a factory for bytebuffer.
2016-04-25 11:39:14 +09:00
HyoJong aeb64756a0 Merge pull request #1710 from denzelsN/master
fix jshint warning
2016-04-25 10:31:14 +09:00
denz ccebbeab80 fix jshint warning 2016-04-25 10:29:35 +09:00
Woonduk Kang 2c5f549eae Merge pull request #1707 from emeroad/master
add /target/ to .gitignore
2016-04-22 11:27:36 +09:00
emeroad 7835e90183 add /target/ to .gitignore 2016-04-22 11:18:52 +09:00
HyoJong a07712d826 Merge pull request #1706 from denzelsN/master
update alarm ui and ux of configuration
2016-04-22 09:59:18 +09:00
denz 2a37166412 Merge remote-tracking branch 'upstream/master' 2016-04-22 09:56:09 +09:00
denz fdff1a574f remove test line 2016-04-22 09:54:59 +09:00
denz 3ef66ab949 update alarm rule, pinpoint user ui. 2016-04-22 09:54:58 +09:00
denz af344377bd update user group and group member of alarm configuration ui 2016-04-22 09:54:58 +09:00
denz c47f9e339c update alarm user group UI 2016-04-22 09:54:58 +09:00
denz 5e45e791b4 update general configuration ui 2016-04-22 09:54:58 +09:00
denz d7d677ea76 update help ui of configuration popup. 2016-04-22 09:54:58 +09:00
HyunGil Jeong 122b2db8d5 Merge pull request #1704 from Xylus/testfix/mybatis-spring-1.3.0
Fix integration tests to support mybatis-spring v1.3.x
test fix - no review required
2016-04-20 15:23:21 +09:00
HyunGil Jeong a244e1c820 Fix integration tests to support mybatis-spring v1.3.x
Fix incomplete commit done previously.
2016-04-20 15:21:11 +09:00
HyunGil Jeong ed520a61b5 Merge pull request #1703 from Xylus/testfix/mybatis-spring-1.3.0
Fix integration tests to support mybatis-spring v1.3.x
test fix - no review required
2016-04-20 13:54:31 +09:00
HyunGil Jeong e582c20d17 Fix integration tests to support mybatis-spring v1.3.x 2016-04-20 11:56:53 +09:00
koo-taejin 968d9c5802 Merge pull request #1698 from koo-taejin/#1683
Support the async put API provided by HTableMultiplexer to improve th…
2016-04-19 14:44:41 +09:00
koo.taejin 5684dc6e10 Support the async put API provided by HTableMultiplexer to improve the write throughput in collector. #1683
- set default value
2016-04-19 14:44:13 +09:00
koo-taejin a5e45602c7 Merge pull request #1697 from koo-taejin/#1695
About some configure parameters's meaning? #1695
2016-04-19 11:08:58 +09:00
koo.taejin 59d41cebb8 About some configure parameters's meaning? #1695 2016-04-19 10:59:25 +09:00
koo-taejin f19a35fd2e Merge pull request #1696 from koo-taejin/#1683
Support the async put API provided by HTableMultiplexer to improve th…
2016-04-19 10:51:02 +09:00
koo.taejin 8f3f869438 Support the async put API provided by HTableMultiplexer to improve the write throughput in collector. #1683
- set default value
2016-04-19 10:50:07 +09:00
Woonduk Kang e97a9a9f6f Merge pull request #1694 from koo-taejin/#1683
Support the async put API provided by HTableMultiplexer to improve th…
2016-04-15 17:27:01 +09:00
koo.taejin 4131bbf861 Support the async put API provided by HTableMultiplexer to improve the write throughput in collector. #1683
- If asyncOperation is not set, then execute put method instead of asyncPut method.
 - wait destory method until async queue is empty.
2016-04-15 16:54:24 +09:00
Minwoo Jung d294ed002e Merge pull request #1693 from minwoo-jung/naver-693
[NO-ISSUE] edit mybaits config
2016-04-15 16:13:26 +09:00
Minwoo Jung ef59e1f770 [NO-ISSUE] edit mybaits config 2016-04-15 16:11:36 +09:00
Minwoo Jung b9d2bc8787 Merge pull request #1692 from minwoo-jung/naver-693
[#1613] remove dependency for spring-data-hadoop-hbase
2016-04-15 15:45:57 +09:00
Minwoo Jung 51b310cdb1 [#1613] remove dependency for spring-data-hadoop-hbase 2016-04-15 15:44:32 +09:00
Minwoo Jung 2ad2908a63 Merge pull request #1691 from minwoo-jung/naver-693
[#] add dependency temporarily
2016-04-15 14:45:25 +09:00
Minwoo Jung 45247568bd [#] add dependency temporarily 2016-04-15 14:41:53 +09:00
HyoJong 1786f9f491 Merge pull request #1690 from denzelsN/master
resize image size
2016-04-15 11:44:53 +09:00