[39/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-11-28 Thread agoncharuk 
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/56aeea3d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/56aeea3d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/56aeea3d

Branch: refs/heads/ignite-1282
Commit: 56aeea3d1f519229ad7ce80992a23bf367ef72c1
Parents: fc10b3e e519c2f
Author: vozerov-gridgain 
Authored: Fri Nov 27 16:48:28 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 16:48:28 2015 +0300

--
 .../hibernate/CacheHibernatePersonStore.java|   4 +-
 .../hibernate/CacheHibernateStoreExample.java   |   2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |   2 +-
 .../apache/ignite/examples/binary/Address.java  |  72 -
 .../apache/ignite/examples/binary/Employee.java |  93 ---
 .../ignite/examples/binary/EmployeeKey.java |  93 ---
 .../ignite/examples/binary/Organization.java|  93 ---
 .../examples/binary/OrganizationType.java   |  32 
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  22 +--
 .../examples/datagrid/CacheQueryExample.java| 161 ---
 .../ignite/examples/datagrid/store/Person.java  | 154 --
 .../store/auto/CacheAutoStoreExample.java   |   4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |   4 +-
 .../datagrid/store/auto/CacheConfig.java|   6 +-
 .../store/dummy/CacheDummyPersonStore.java  |  12 +-
 .../store/dummy/CacheDummyStoreExample.java |   4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|  18 +--
 .../store/jdbc/CacheJdbcStoreExample.java   |   4 +-
 .../store/spring/CacheSpringPersonStore.java|  10 +-
 .../store/spring/CacheSpringStoreExample.java   |   4 +-
 .../ignite/examples/model/Organization.java |  55 +++
 .../apache/ignite/examples/model/Person.java| 120 ++
 .../ignite/examples/model/binary/Address.java   |  72 +
 .../ignite/examples/model/binary/Employee.java  |  93 +++
 .../examples/model/binary/EmployeeKey.java  |  93 +++
 .../examples/model/binary/Organization.java |  93 +++
 .../examples/model/binary/OrganizationType.java |  32 
 .../examples/ScalarCacheQueryExample.scala  |  66 ++--
 30 files changed, 651 insertions(+), 777 deletions(-)
--

[39/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

2015-11-24 Thread sboikov 
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ab8298af
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ab8298af
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ab8298af

Branch: refs/heads/ignite-1924
Commit: ab8298afe65973750abe40f402246c77283955ba
Parents: bcfe78b 8e7e330
Author: Anton Vinogradov 
Authored: Fri Nov 20 18:17:49 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Nov 20 18:17:49 2015 +0300

--
 .../datastructures/IgniteSemaphoreExample.java  | 168 
 .../ignite/examples/CacheExamplesSelfTest.java  |  10 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  17 +
 .../java/org/apache/ignite/IgniteSemaphore.java | 312 
 .../apache/ignite/events/DiscoveryEvent.java|   6 +-
 .../apache/ignite/internal/IgniteKernal.java|  21 +
 .../datastructures/DataStructuresProcessor.java | 199 -
 .../datastructures/GridCacheSemaphoreEx.java|  47 ++
 .../datastructures/GridCacheSemaphoreImpl.java  | 763 +++
 .../datastructures/GridCacheSemaphoreState.java | 144 
 .../IgniteClientReconnectAtomicsTest.java   |  44 +-
 ...eAbstractDataStructuresFailoverSelfTest.java | 275 ++-
 .../IgniteClientDataStructuresAbstractTest.java |  59 +-
 .../IgniteDataStructureUniqueNameTest.java  |  14 +-
 .../IgniteSemaphoreAbstractSelfTest.java| 411 ++
 .../local/IgniteLocalSemaphoreSelfTest.java |  98 +++
 .../IgnitePartitionedSemaphoreSelfTest.java |  33 +
 ...eplicatedDataStructuresFailoverSelfTest.java |   2 +-
 .../IgniteReplicatedSemaphoreSelfTest.java  |  33 +
 .../cache/GridCacheDataStructuresLoadTest.java  | 283 ---
 .../ignite/testframework/junits/IgniteMock.java |  10 +
 .../junits/multijvm/IgniteProcessProxy.java |   7 +
 .../org/apache/ignite/IgniteSpringBean.java |  12 +
 23 files changed, 2837 insertions(+), 131 deletions(-)
--