Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C93D5178B3 for ; Thu, 2 Apr 2015 13:01:11 +0000 (UTC) Received: (qmail 27013 invoked by uid 500); 2 Apr 2015 13:01:11 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 26980 invoked by uid 500); 2 Apr 2015 13:01:11 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 26971 invoked by uid 99); 2 Apr 2015 13:01:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2015 13:01:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 02 Apr 2015 13:00:49 +0000 Received: (qmail 25653 invoked by uid 99); 2 Apr 2015 13:00:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2015 13:00:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3B670E2F45; Thu, 2 Apr 2015 13:00:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 02 Apr 2015 13:00:56 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/11] incubator-ignite git commit: Merge branch 'ignite-sprint-3' into ignite-gg-9973 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-sprint-3' into ignite-gg-9973 Conflicts: modules/core/src/main/resources/META-INF/classnames.properties Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/db2eb602 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db2eb602 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db2eb602 Branch: refs/heads/ignite-gg-9973 Commit: db2eb60296d908a2a596b7e48a2f3c12a1630cbf Parents: d8faed2 07ca9fa Author: vozerov-gridgain Authored: Thu Apr 2 16:00:54 2015 +0300 Committer: vozerov-gridgain Committed: Thu Apr 2 16:00:54 2015 +0300 ---------------------------------------------------------------------- examples/pom-standalone.xml | 1 - ipc/shmem/README.txt | 2 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../visor/cache/VisorCacheConfiguration.java | 81 +++++-------- .../cache/VisorCacheNearConfiguration.java | 11 +- .../visor/node/VisorGridConfiguration.java | 28 ++++- .../internal/visor/util/VisorMimeTypes.java | 4 +- .../resources/META-INF/classnames.properties | 79 ++++--------- .../processors/igfs/IgsfStartCacheTest.java | 115 +++++++++++++++++++ .../GridUriDeploymentFileResourceLoader.java | 2 +- 10 files changed, 208 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db2eb602/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db2eb602/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --cc modules/core/src/main/resources/META-INF/classnames.properties index 8bb4d5c,55c1f9d..d7213a4 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@@ -432,11 -433,9 +433,9 @@@ org.apache.ignite.internal.processors.c org.apache.ignite.internal.processors.cache.GridCacheUtils$9 org.apache.ignite.internal.processors.cache.GridCacheValueCollection org.apache.ignite.internal.processors.cache.GridCacheValueCollection$1 -org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$StatefulValue -org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$StoreOperation -org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$ValueStatus +org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$StatefulValue +org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$StoreOperation +org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$ValueStatus - org.apache.ignite.internal.processors.cache.GridPartitionLockKey - org.apache.ignite.cache.CacheExistsException org.apache.ignite.internal.processors.cache.IgniteCacheProxy org.apache.ignite.internal.processors.cache.IgniteCacheProxy$1 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$2