Merge branch 'ignite-1.7.7' into ignite-1.8.3 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java # modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs # modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs # modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/caa3acb5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/caa3acb5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/caa3acb5 Branch: refs/heads/ignite-1.9 Commit: caa3acb519e98a86def1ead13e2d0f2e59e620b5 Parents: 03f6822 0a43665 Author: devozerov <[email protected]> Authored: Tue Feb 14 12:09:10 2017 +0300 Committer: devozerov <[email protected]> Committed: Tue Feb 14 12:09:10 2017 +0300 ---------------------------------------------------------------------- NOTICE | 2 +- assembly/NOTICE_FABRIC | 2 +- assembly/NOTICE_HADOOP | 2 +- modules/core/src/main/java/META-INF/NOTICE | 2 +- .../ignite/internal/IgniteVersionUtils.java | 2 +- .../processors/cache/EntryGetResult.java | 40 +++++- .../processors/cache/EntryGetWithTtlResult.java | 58 +++++++++ .../processors/cache/GridCacheAdapter.java | 104 ++++++++-------- .../processors/cache/GridCacheContext.java | 122 +++++++++++++++---- .../processors/cache/GridCacheEntryEx.java | 6 +- .../processors/cache/GridCacheMapEntry.java | 46 +++++-- .../GridDistributedCacheAdapter.java | 6 +- .../distributed/dht/GridDhtCacheAdapter.java | 10 +- .../cache/distributed/dht/GridDhtGetFuture.java | 24 ++-- .../distributed/dht/GridDhtGetSingleFuture.java | 24 ++-- .../distributed/dht/GridDhtLockFuture.java | 21 +++- .../dht/GridDhtTransactionalCacheAdapter.java | 7 ++ .../distributed/dht/GridDhtTxLocalAdapter.java | 8 +- .../dht/GridPartitionedGetFuture.java | 20 ++- .../dht/GridPartitionedSingleGetFuture.java | 9 +- .../dht/atomic/GridDhtAtomicCache.java | 15 ++- .../dht/colocated/GridDhtColocatedCache.java | 25 +++- .../colocated/GridDhtColocatedLockFuture.java | 10 +- .../distributed/near/GridNearAtomicCache.java | 1 + .../distributed/near/GridNearGetFuture.java | 10 +- .../distributed/near/GridNearGetRequest.java | 77 ++++++++---- .../distributed/near/GridNearLockFuture.java | 7 ++ .../distributed/near/GridNearLockRequest.java | 81 ++++++++---- .../near/GridNearSingleGetRequest.java | 57 ++++++--- .../near/GridNearTransactionalCache.java | 2 + .../cache/distributed/near/GridNearTxLocal.java | 25 ++-- .../processors/cache/local/GridLocalCache.java | 1 + .../local/atomic/GridLocalAtomicCache.java | 14 +-- .../transactions/IgniteTxLocalAdapter.java | 102 +++++++++++----- .../cache/transactions/IgniteTxLocalEx.java | 3 + .../cache/GridCacheAbstractFullApiSelfTest.java | 20 ++- .../processors/cache/GridCacheTestEntryEx.java | 107 ++++++++-------- .../CacheLockReleaseNodeLeaveTest.java | 65 +++++++++- .../IgniteCacheExpiryPolicyAbstractTest.java | 44 ++++++- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 102 ++++++++++++++++ .../IgniteCacheTxExpiryPolicyWithStoreTest.java | 21 ++++ .../startup/GridRandomCommandLineLoader.java | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.AspNet.nuspec | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.Core.Schema.nuspec | 2 +- .../Apache.Ignite.Core.nuspec | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.Linq.nuspec | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.Log4Net.nuspec | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.NLog.nuspec | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- .../app/modules/branding/branding.provider.js | 2 +- .../views/templates/agent-download.jade | 2 +- modules/web-console/web-agent/README.txt | 2 +- parent/pom.xml | 2 +- 67 files changed, 1000 insertions(+), 356 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index e954748,11bf34b..a50661e --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@@ -1536,7 -1548,7 +1539,7 @@@ public abstract class GridCacheAdapter< long start = statsEnabled ? System.nanoTime() : 0L; - Map<K, T2<V, GridCacheVersion>> map = (Map<K, T2<V, GridCacheVersion>>)getAll0(keys, !ctx.keepBinary(), true); - Map<K, EntryGetResult> map = (Map<K, EntryGetResult>)getAll(keys, !ctx.keepBinary(), true); ++ Map<K, EntryGetResult> map = (Map<K, EntryGetResult>)getAll0(keys, !ctx.keepBinary(), true); Collection<CacheEntry<K, V>> res = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 04ca50c,1a9b082..ea816fe --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@@ -475,12 -478,13 +478,13 @@@ public abstract class IgniteTxLocalAdap CacheObject cacheVal = cacheCtx.toCacheObject(val); while (true) { - GridCacheEntryEx entry = cacheCtx.cache().entryEx(key); + GridCacheEntryEx entry = cacheCtx.cache().entryEx(key, topVer); try { - T2<CacheObject, GridCacheVersion> verVal = entry.versionedValue(cacheVal, + EntryGetResult verVal = entry.versionedValue(cacheVal, ver, null, + null, null); if (log.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.nuspec ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.nuspec index 49f2fe8,236584e..7891614 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.nuspec +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.nuspec @@@ -44,8 -44,11 +44,8 @@@ Session State Store Provider: stores se More info: https://apacheignite-net.readme.io/ </description> - <summary> - Apache Ignite ASP.NET Integration - </summary> <releaseNotes></releaseNotes> - <copyright>Copyright 2016</copyright> + <copyright>Copyright 2017</copyright> <tags>OutputCacheProvider Apache Ignite In-Memory Distributed Computing SQL NoSQL Grid Map Reduce Cache</tags> <dependencies> <dependency id="Apache.Ignite" version="[$version$]" /> http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs index a1c19d3,ad1d5ab..87028b1 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs @@@ -25,7 -25,7 +25,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] - [assembly: AssemblyCopyright("Copyright 2016")] -[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs index 49a0395,a1d8aef..9c94569 --- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs @@@ -23,7 -23,7 +23,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] - [assembly: AssemblyCopyright("Copyright 2016")] -[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs index 0b8ce1e,3994598..0367c9c --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs @@@ -23,7 -23,7 +23,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] - [assembly: AssemblyCopyright("Copyright 2016")] -[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs index 463ed3e,d8bb169..802bff7 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs @@@ -23,7 -23,7 +23,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] - [assembly: AssemblyCopyright("Copyright 2016")] -[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.Schema.nuspec ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec index 8621103,2c4dfc1..8f562f1 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec @@@ -44,8 -44,11 +44,8 @@@ Apache Ignite In-Memory Data Fabric is More info: https://apacheignite-net.readme.io/ </description> - <summary> - High-performance in-memory platform for computing and transacting on large-scale data sets in real-time. - </summary> <releaseNotes></releaseNotes> - <copyright>Copyright 2016</copyright> + <copyright>Copyright 2017</copyright> <tags>Apache Ignite In-Memory Distributed Computing SQL NoSQL Grid Map Reduce Cache linqpad-samples</tags> </metadata> <files> http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs index 2a14a25,f8512f1..71d65a6 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs @@@ -25,7 -25,7 +25,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] - [assembly: AssemblyCopyright("Copyright 2016")] -[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.Linq/Apache.Ignite.Linq.nuspec ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Linq/Apache.Ignite.Linq.nuspec index 330ed29,93aa8c2..c71d672 --- a/modules/platforms/dotnet/Apache.Ignite.Linq/Apache.Ignite.Linq.nuspec +++ b/modules/platforms/dotnet/Apache.Ignite.Linq/Apache.Ignite.Linq.nuspec @@@ -46,8 -46,11 +46,8 @@@ All Ignite SQL features are supported: More info: https://apacheignite-net.readme.io/ </description> - <summary> - LINQ Provider for Apache Ignite - </summary> <releaseNotes></releaseNotes> - <copyright>Copyright 2016</copyright> + <copyright>Copyright 2017</copyright> <tags>Apache Ignite In-Memory Distributed Computing SQL NoSQL LINQ Grid Map Reduce Cache linqpad-samples</tags> <dependencies> <dependency id="Apache.Ignite" version="[$version$]" /> http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs index 8e07c7d,446fe1e..bed6694 --- a/modules/platforms/dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs @@@ -24,7 -24,7 +24,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] - [assembly: AssemblyCopyright("Copyright 2016")] -[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.Log4Net/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite.NLog/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs index d805afb,41b6289..b36491a --- a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs @@@ -23,7 -23,7 +23,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] - [assembly: AssemblyCopyright("Copyright 2016")] -[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs index 9082035,396eeb6..ff7aa44 --- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs @@@ -23,7 -23,7 +23,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] - [assembly: AssemblyCopyright("Copyright 2016")] -[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs index 3e55f91,0855afb..3ad324e --- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs @@@ -23,7 -23,7 +23,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] - [assembly: AssemblyCopyright("Copyright 2016")] -[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/scalar-2.10/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/modules/scalar/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/caa3acb5/parent/pom.xml ----------------------------------------------------------------------
