GitHub user sk0x50 opened a pull request:
https://github.com/apache/ignite/pull/2683
Ignite-6420 Time metrics (CacheMetrics.getAverage###Time) should be
calculated on primary node in case of ATOMIC cache
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/sk0x50/ignite ignite-6420
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/2683.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2683
commit d939944f84aa415099a945b720dd4cd65132f6af
Author: Alexey Kuznetsov
Date: 2017-03-21T03:05:33Z
IGNITE-1.8.4 Manual merge with master.
commit 71c62f70df2b79f706b6cca157bccfbcea0ae5ef
Author: Alexey Kuznetsov
Date: 2017-03-21T03:20:39Z
IGNITE-4830 Implemented better SQL errors handling.
(cherry picked from commit fbb9940)
commit 93faee3579389c5754e3b91bcd39cc88dcf39125
Author: Alexey Kuznetsov
Date: 2017-03-21T04:07:15Z
Web Console: Update classnames.properties.
commit 45812566694d016c07b47fa589bbba612c26f824
Author: Alexey Kuznetsov
Date: 2017-03-21T04:23:18Z
Web Console: minor fix.
(cherry picked from commit 92bce6e)
commit f4232e9557fca89065f4ee424afab940265e2d1b
Author: oleg-ostanin
Date: 2017-03-21T12:32:33Z
IGNITE-4822 Fixed change jvm options for benchmarks
commit ab3b2926213291a45305c21e7efe066855c1342f
Author: Igor Sapego
Date: 2017-03-21T14:47:09Z
IGNITE-4200: Added copying of the C++ binaries.
commit e0c012d977b6db13dfdf2fb8347677998287c1e4
Author: Igor Sapego
Date: 2017-03-21T14:50:06Z
IGNITE-4200: Added copying of the C++ binaries.
commit 6e2bc4bfb0b200e59c9fc3cf4fcbd408d52acb9c
Author: Igor Sapego
Date: 2017-03-21T14:51:40Z
IGNITE-4200: Added copying of the C++ binaries.
commit 8273e6703944ea50b229a512398ac741eb713073
Author: Anton Vinogradov
Date: 2017-03-21T15:04:01Z
IGNITE-4779 Missed discovery data snapshot during exchange processing
(Backport from 2.0)
commit 6775f646df127f5cdbabf7a154b65856f38afa1e
Author: Dmitriy Shabalin
Date: 2017-03-22T03:37:05Z
IGNITE-4686 Added ability to group registered users in admin panel.
(cherry picked from commit 827befb)
commit 7d94963251cc66823883d760668c2e2b31574bf1
Author: Andrey Novikov
Date: 2017-03-22T11:20:32Z
IGNITE-4659 Fixed error page.
(cherry picked from commit 50de012)
commit eb837c7853ffc68e5a3f690e985407e603e3f955
Author: Andrey Novikov
Date: 2017-03-22T11:21:03Z
IGNITE-4854 Fixed project structure button on summary page under firefox.
(cherry picked from commit 117e18e)
commit 8d9ade2cc2d71f12a427e3effa3846a928b0681e
Author: dkarachentsev
Date: 2017-03-22T11:57:24Z
Merge branch 'ignite-1.7.9-p1' into ignite-1.7.10
commit 3aa2a68c02879ec57c46091cd2f22a9ac4b129ad
Author: dkarachentsev
Date: 2017-03-22T12:22:50Z
Merge branch 'ignite-1.7.9-p1' into ignite-1.8.5
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
commit ec7b9d848274b229b69dc7b8a20902654f719c44
Author: Andrey Novikov
Date: 2017-03-23T02:32:38Z
IGNITE-4855 Fixed error on switching between notebooks.
(cherry picked from commit 6a148e2)
commit 36f7621b6eaa710d3b1eba7fddd0dfe92e11133e
Author: Andrey Novikov
Date: 2017-03-23T03:57:03Z
IGNITE-4830 Fixed error ui.
(cherry picked from commit 48e78a9)
commit 1f3b2fcd003c1f084874d5c421953da0a7cd02cb
Author: Valentin Kulichenko
Date: 2017-03-28T01:12:17Z
IGNITE-4802 - Separate thread pool for managed services
commit 39edcc7890ce497771f532a83a57ecae318d8c88
Author: Andrey V. Mashenkov
Date: 2017-03-28T15:56:17Z
IGNITE-4815: Fixed confusing javadoc. This closes #1613.
commit e47bf27b5582cd695a7d3de3c39d54b3df4c59cc
Author: Valentin Kulichenko
Date: 2017-03-28T23:51:44Z
IGNITE-4762 - transactionsAllowed flag for JDBC driver
commit 336672432486830c31cb4b6f8bb1b401c276f3e5
Author: Alexey Kuznetsov
Date: 2017-03-29T03:53:25Z
IGNITE-4659 Fixed typo.
(cherry picked from commit 6f1e970)
commit 1ddce5517815fc85136e2ead9973c8cf74054f9f
Author: Alexey Kuznetsov
Date: 2017-03-29T04:11:33Z
Merge branch 'web-console-production' of