Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1 Conflicts: benchmarks/cache-comparison/pom.xml benchmarks/filesystem/hadoop1/pom.xml benchmarks/filesystem/hadoop2/pom.xml benchmarks/mongo/pom.xml benchmarks/risk-analytics/pom.xml benchmarks/serialization/pom.xml benchmarks/yardstick/src/main/dotnet/gridgain-benchmarks/Properties/AssemblyInfo.cs examples/pom.xml modules/clients/pom.xml modules/codegen/pom.xml modules/compatibility/pom.xml modules/core/pom.xml modules/core/src/main/resources/gridgain.properties modules/diagnostic/pom.xml modules/dr-demo/pom.xml modules/license-gen/pom.xml modules/mongo-sniffer/pom.xml modules/mongo-visor/pom.xml modules/mongo/pom.xml modules/platforms/cpp/core-test/configure.ac modules/platforms/cpp/core/configure.ac modules/platforms/cpp/examples/configure.ac modules/platforms/dotnet/examples/GridGainExamples/Properties/AssemblyInfo.cs modules/platforms/dotnet/examples/GridGainExamplesDll/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-examples-test/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-exe/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-test-compatibility/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-test-dll/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-test-runner/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-test/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain/Properties/AssemblyInfo.cs modules/tools/pom.xml modules/visor-console/pom.xml modules/visor-demo/pom.xml modules/visor-tester-plugin/pom.xml modules/visor-tester/pom.xml modules/visor/pom.xml modules/yardstick/dotnet/Properties/AssemblyInfo.cs modules/yardstick/pom.xml parent/pom.xml pilots/chronotrack/pom.xml pilots/ctb/pom.xml pilots/dsi/pom.xml pilots/ionic/pom.xml pilots/sb/pom.xml pilots/sony/pom.xml pilots/wellsfargo/pom.xml pilots/worldpay/pom.xml pom.xml
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1 Conflicts: examples/pom.xml examples/schema-import/pom.xml modules/aop/pom.xml modules/apache-license-gen/pom.xml modules/aws/pom.xml modules/camel/pom.xml modules/clients/pom.xml modules/cloud/pom.xml modules/codegen/pom.xml modules/core/pom.xml modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java modules/core/src/main/resources/ignite.properties modules/extdata/p2p/pom.xml modules/extdata/uri/modules/uri-dependency/pom.xml modules/extdata/uri/pom.xml modules/flume/pom.xml modules/gce/pom.xml modules/geospatial/pom.xml modules/hadoop/pom.xml modules/hibernate/pom.xml modules/indexing/pom.xml modules/jcl/pom.xml modules/jms11/pom.xml modules/jta/pom.xml modules/kafka/pom.xml modules/log4j/pom.xml modules/log4j2/pom.xml modules/mesos/pom.xml modules/mqtt/pom.xml modules/platforms/cpp/common/configure.ac modules/platforms/cpp/core-test/configure.ac modules/platforms/cpp/core/configure.ac modules/platforms/cpp/examples/configure.ac modules/platforms/cpp/ignite/configure.ac 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/Properties/AssemblyInfo.cs modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs modules/rest-http/pom.xml modules/scalar-2.10/pom.xml modules/scalar/pom.xml modules/schedule/pom.xml modules/schema-import/pom.xml modules/slf4j/pom.xml modules/spark-2.10/pom.xml modules/spark/pom.xml modules/spring/pom.xml modules/ssh/pom.xml modules/tools/pom.xml modules/twitter/pom.xml modules/urideploy/pom.xml modules/visor-console-2.10/pom.xml modules/visor-console/pom.xml modules/visor-plugins/pom.xml modules/web/pom.xml modules/yardstick/pom.xml modules/yarn/pom.xml modules/zookeeper/pom.xml pom.xml Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebb4aa63 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebb4aa63 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebb4aa63 Branch: refs/heads/ignite-1.5.1 Commit: ebb4aa63b0866699513d75f51efdfbb34980cf83 Parents: 250aa4f 0adee3a Author: Anton Vinogradov <a...@apache.org> Authored: Wed Dec 9 10:35:43 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Wed Dec 9 10:35:43 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 1 + bin/ignite.bat | 5 +- bin/include/parseargs.bat | 2 +- examples/config/example-default.xml | 7 + examples/pom.xml | 4 +- examples/schema-import/pom.xml | 4 +- .../store/auto/CacheBinaryAutoStoreExample.java | 158 ++++ .../datagrid/store/auto/package-info.java | 22 + .../store/auto/CacheAutoStoreExample.java | 93 ++- .../auto/CacheAutoStoreLoadDataExample.java | 85 -- .../datagrid/store/auto/CacheConfig.java | 81 -- .../datagrid/store/auto/DbH2ServerStartup.java | 79 -- .../messaging/MessagingPingPongExample.java | 4 - .../ignite/examples/util/DbH2ServerStartup.java | 79 ++ .../ignite/examples/util/package-info.java | 22 + .../examples/MessagingExamplesSelfTest.java | 2 - modules/aop/pom.xml | 14 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 20 +- modules/camel/pom.xml | 13 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- .../ignite/codegen/MessageCodeGenerator.java | 6 +- modules/core/pom.xml | 30 +- .../main/java/org/apache/ignite/Ignition.java | 16 + .../store/jdbc/CacheAbstractJdbcStore.java | 17 +- .../cache/store/jdbc/CacheJdbcPojoStore.java | 9 + .../configuration/CacheConfiguration.java | 35 +- .../configuration/IgniteConfiguration.java | 6 +- .../apache/ignite/internal/GridComponent.java | 3 +- .../ignite/internal/GridPluginComponent.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 20 +- .../org/apache/ignite/internal/IgnitionEx.java | 39 +- .../ignite/internal/MarshallerContextImpl.java | 30 +- .../internal/managers/GridManagerAdapter.java | 5 +- .../managers/communication/GridIoManager.java | 3 +- .../communication/GridIoMessageFactory.java | 8 +- .../deployment/GridDeploymentManager.java | 5 +- .../internal/portable/BinaryFieldAccessor.java | 9 +- .../internal/portable/BinaryReaderExImpl.java | 21 +- .../internal/portable/BinaryWriterExImpl.java | 24 +- .../internal/portable/PortableContext.java | 46 +- .../processors/GridProcessorAdapter.java | 5 +- .../CacheDefaultBinaryAffinityKeyMapper.java | 2 +- .../processors/cache/GridCacheAdapter.java | 65 +- .../cache/GridCacheConcurrentMap.java | 734 +++++------------ .../processors/cache/GridCacheContext.java | 36 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 44 +- .../cache/GridCacheMapEntryFactory.java | 13 +- .../GridCachePartitionExchangeManager.java | 17 +- .../processors/cache/GridCachePreloader.java | 11 +- .../processors/cache/GridCacheProcessor.java | 28 +- .../CacheDataStructuresManager.java | 31 +- .../distributed/GridDistributedCacheEntry.java | 14 +- .../dht/GridDhtAffinityAssignmentResponse.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 13 +- .../distributed/dht/GridDhtCacheEntry.java | 14 +- .../dht/GridDhtOffHeapCacheEntry.java | 15 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 51 +- .../distributed/dht/GridNoStorageCacheMap.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 43 +- .../dht/atomic/GridDhtAtomicCacheEntry.java | 16 +- .../atomic/GridDhtAtomicOffHeapCacheEntry.java | 15 +- .../dht/colocated/GridDhtColocatedCache.java | 13 +- .../colocated/GridDhtColocatedCacheEntry.java | 14 +- .../GridDhtColocatedOffHeapCacheEntry.java | 15 +- .../colocated/GridDhtDetachedCacheEntry.java | 4 +- .../dht/preloader/GridDhtPartitionDemander.java | 41 +- .../GridDhtPartitionsExchangeFuture.java | 9 +- .../dht/preloader/GridDhtPreloader.java | 4 +- .../preloader/GridDhtPreloaderAssignments.java | 19 +- .../distributed/near/GridNearCacheAdapter.java | 8 +- .../distributed/near/GridNearCacheEntry.java | 16 +- .../near/GridNearOffHeapCacheEntry.java | 15 +- .../processors/cache/local/GridLocalCache.java | 8 +- .../cache/local/GridLocalCacheEntry.java | 15 +- .../local/atomic/GridLocalAtomicCache.java | 8 +- .../CacheObjectBinaryProcessorImpl.java | 49 +- .../cache/query/GridCacheQueryManager.java | 58 +- .../cache/transactions/IgniteTxAdapter.java | 5 + .../cache/transactions/IgniteTxEntry.java | 8 +- .../transactions/IgniteTxLocalAdapter.java | 11 +- .../datastructures/CollocatedQueueItemKey.java | 75 ++ .../datastructures/CollocatedSetItemKey.java | 87 ++ .../datastructures/DataStructuresProcessor.java | 11 +- .../GridAtomicCacheQueueImpl.java | 8 +- .../datastructures/GridCacheQueueAdapter.java | 30 +- .../datastructures/GridCacheQueueItemKey.java | 9 +- .../datastructures/GridCacheSetImpl.java | 37 +- .../datastructures/GridCacheSetItemKey.java | 21 +- .../GridTransactionalCacheQueueImpl.java | 2 +- .../processors/datastructures/QueueItemKey.java | 27 + .../processors/datastructures/SetItemKey.java | 36 + .../handlers/query/QueryCommandHandler.java | 8 +- .../internal/util/GridMessageCollection.java | 160 ++++ .../ignite/internal/util/IgniteUtils.java | 18 +- .../internal/util/UUIDCollectionMessage.java | 42 +- .../util/nio/GridNioBackPressureControl.java | 14 +- .../optimized/OptimizedMarshallerUtils.java | 16 +- .../org/apache/ignite/spi/IgniteSpiThread.java | 10 +- .../communication/tcp/TcpCommunicationSpi.java | 6 +- .../org/apache/ignite/thread/IgniteThread.java | 43 +- .../ignite/thread/IgniteThreadPoolExecutor.java | 37 +- .../core/src/main/resources/ignite.properties | 2 +- .../IgniteClientReconnectAbstractTest.java | 95 ++- .../IgniteClientReconnectAtomicsTest.java | 57 ++ .../IgniteClientReconnectCacheTest.java | 5 +- .../IgniteClientReconnectCollectionsTest.java | 51 ++ .../portable/BinaryMarshallerSelfTest.java | 2 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 6 +- .../cache/GridCacheAlwaysEvictionPolicy.java | 2 +- ...eAtomicEntryProcessorDeploymentSelfTest.java | 6 +- .../cache/GridCacheConcurrentMapSelfTest.java | 11 - .../GridCacheConditionalDeploymentSelfTest.java | 20 +- .../cache/GridCacheDeploymentSelfTest.java | 11 +- ...CacheMultinodeUpdateNearEnabledSelfTest.java | 5 + .../IgniteCacheEntryProcessorCallTest.java | 497 ++++++++++++ .../cache/IgniteCacheInvokeAbstractTest.java | 369 ++++++--- ...eAbstractDataStructuresFailoverSelfTest.java | 9 +- .../GridCacheQueueApiSelfAbstractTest.java | 18 +- .../GridCacheSetFailoverAbstractSelfTest.java | 6 +- .../GridCachePartitionedQueueApiSelfTest.java | 5 + ...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +- .../IgnitePartitionedQueueNoBackupsTest.java | 92 +++ .../GridCacheReplicatedQueueApiSelfTest.java | 5 + .../CacheLockReleaseNodeLeaveTest.java | 161 ++++ .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 37 +- .../dht/GridCacheTxNodeFailureSelfTest.java | 2 + .../dht/GridNearCacheTxNodeFailureSelfTest.java | 4 - ...idCachePartitionedHitsAndMissesSelfTest.java | 4 +- ...cingDelayedPartitionMapExchangeSelfTest.java | 9 +- .../GridCacheRebalancingAsyncSelfTest.java | 3 +- .../GridCacheRebalancingSyncCheckDataTest.java | 98 +++ .../GridCacheRebalancingSyncSelfTest.java | 55 +- ...eRebalancingUnmarshallingFailedSelfTest.java | 6 +- .../GridCacheWriteBehindStoreAbstractTest.java | 2 +- .../DataStreamProcessorSelfTest.java | 25 +- .../internal/util/nio/GridNioSelfTest.java | 69 +- .../loadtests/hashmap/GridHashMapLoadTest.java | 4 +- .../marshaller/GridMarshallerAbstractTest.java | 32 +- .../config/GridTestProperties.java | 6 + .../testframework/junits/GridAbstractTest.java | 31 +- .../junits/IgniteTestResources.java | 2 +- .../IgniteBinaryObjectsCacheTestSuite3.java | 2 + .../IgniteCacheDataStructuresSelfTestSuite.java | 3 + .../ignite/testsuites/IgniteCacheTestSuite.java | 6 +- .../testsuites/IgniteCacheTestSuite2.java | 2 + .../testsuites/IgniteCacheTestSuite3.java | 2 + .../IgnitePortableCacheTestSuite.java | 3 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 + .../ignite/util/GridMessageCollectionTest.java | 105 +++ modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 18 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 22 +- modules/hadoop/pom.xml | 4 +- modules/hibernate/pom.xml | 12 +- modules/indexing/pom.xml | 24 +- ...cheDuplicateEntityConfigurationSelfTest.java | 126 +++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 5 + .../IgniteCacheQuerySelfTestSuite.java | 4 + modules/jcl/pom.xml | 13 +- modules/jms11/pom.xml | 22 +- modules/jta/pom.xml | 19 +- modules/kafka/pom.xml | 18 +- modules/log4j/pom.xml | 12 +- modules/log4j2/pom.xml | 13 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 26 +- modules/osgi-karaf/README.txt | 18 + modules/osgi-karaf/licenses/apache-2.0.txt | 202 +++++ modules/osgi-karaf/pom.xml | 83 ++ .../osgi-karaf/src/main/resources/features.xml | 327 ++++++++ modules/osgi-paxlogging/README.txt | 12 + modules/osgi-paxlogging/licenses/apache-2.0.txt | 202 +++++ modules/osgi-paxlogging/pom.xml | 67 ++ modules/osgi/README.txt | 65 ++ modules/osgi/licenses/apache-2.0.txt | 202 +++++ modules/osgi/pom.xml | 170 ++++ .../IgniteAbstractOsgiContextActivator.java | 238 ++++++ .../org/apache/ignite/osgi/IgniteOsgiUtils.java | 69 ++ .../BundleDelegatingClassLoader.java | 147 ++++ .../classloaders/ContainerSweepClassLoader.java | 134 ++++ .../OsgiClassLoadingStrategyType.java | 29 + .../ignite/osgi/AbstractIgniteKarafTest.java | 107 +++ .../IgniteKarafFeaturesInstallationTest.java | 100 +++ .../ignite/osgi/IgniteOsgiServiceTest.java | 131 +++ .../apache/ignite/osgi/IgniteOsgiTestSuite.java | 32 + .../activators/BasicIgniteTestActivator.java | 76 ++ .../ignite/osgi/activators/TestOsgiFlags.java | 53 ++ .../osgi/activators/TestOsgiFlagsImpl.java | 83 ++ modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Binary/BinarySelfTest.cs | 67 ++ .../Apache.Ignite.Core.Tests/EventsTest.cs | 3 +- .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite.Core.csproj | 1 + .../Impl/Binary/BinaryReflectiveActions.cs | 4 +- .../Impl/Common/DelegateConverter.cs | 15 +- .../Apache.Ignite.Core/Impl/NativeMethods.cs | 10 - .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 358 +++++++++ .../Impl/Unmanaged/UnmanagedUtils.cs | 788 +++---------------- .../Properties/AssemblyInfo.cs | 6 +- modules/platforms/dotnet/Apache.Ignite.FxCop | 322 +++++++- .../Apache.Ignite/Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- modules/rest-http/pom.xml | 36 +- modules/scalar-2.10/pom.xml | 11 +- modules/scalar/pom.xml | 11 +- modules/schedule/pom.xml | 27 +- modules/schema-import/pom.xml | 4 +- .../ignite/schema/ui/SchemaImportApp.java | 14 + modules/slf4j/pom.xml | 14 +- modules/spark-2.10/pom.xml | 4 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 32 +- .../ignite/internal/GridFactorySelfTest.java | 29 + .../GridSpringBeanSerializationSelfTest.java | 2 + modules/ssh/pom.xml | 21 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 14 +- modules/urideploy/pom.xml | 19 +- modules/visor-console-2.10/pom.xml | 6 +- modules/visor-console/pom.xml | 4 +- modules/visor-plugins/pom.xml | 6 +- modules/web/pom.xml | 15 +- .../config/benchmark-failover.properties | 2 +- modules/yardstick/pom.xml | 2 +- .../yardstick/cache/IgnitePutTxBenchmark.java | 26 +- ...IgniteTransactionalInvokeRetryBenchmark.java | 4 +- ...IgniteTransactionalWriteInvokeBenchmark.java | 34 +- modules/yarn/pom.xml | 2 +- .../apache/ignite/yarn/utils/package-info.java | 22 + modules/zookeeper/pom.xml | 16 +- parent/pom.xml | 140 +++- pom.xml | 46 +- 247 files changed, 7738 insertions(+), 2528 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ebb4aa63/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs index 5f5767a,3318641..314804e --- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/ebb4aa63/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 165fd20,88b7a23..569f230 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/ebb4aa63/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs index 81148dc,9d32327..c194f29 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/ebb4aa63/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs index d82d096,4fb0458..0f6b32b --- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/ebb4aa63/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs index 6b39342,bd2d2ad..8f9f843 --- a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/ebb4aa63/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs index 78f0c9e,082dde2..7e07d8c --- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/ebb4aa63/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs index 5492d2f,cc08601..43788f5 --- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership.