Merge remote-tracking branch 'remotes/origin/ignite-242' into sprint-1

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

Branch: refs/heads/ignite-nio
Commit: 3feb05f7f0c20f32b467c8998c2be173decf9545
Parents: b8c3135 7508774
Author: Anton Vinogradov <avinogra...@gridgain.com>
Authored: Sat Feb 14 18:00:44 2015 +0300
Committer: Anton Vinogradov <avinogra...@gridgain.com>
Committed: Sat Feb 14 18:00:44 2015 +0300

----------------------------------------------------------------------
 assembly/core-jar.xml                           |   26 +-
 assembly/dependencies-fabric.xml                |   13 +-
 assembly/dependencies-optional-fabric.xml       |    1 -
 assembly/dependencies-optional-hadoop.xml       |    1 -
 examples/pom.xml                                |    6 -
 modules/core/licenses/sun-bcl-license.txt       |   50 +
 modules/core/pom.xml                            |   16 -
 .../optimized/optimized-classnames.properties   |  254 +-
 .../org/jdk8/backport/ConcurrentHashMap8.java   | 3825 ++++++++++++++++++
 .../jdk8/backport/ConcurrentLinkedDeque8.java   | 1983 +++++++++
 .../jdk8/backport/ConcurrentLinkedHashMap.java  | 2170 ++++++++++
 .../main/java/org/jdk8/backport/LongAdder.java  |  235 ++
 .../main/java/org/jdk8/backport/Striped64.java  |  370 ++
 .../org/jdk8/backport/ThreadLocalRandom8.java   |  231 ++
 .../META-INF/licenses/gnu-gplv2ce-license.txt   |  349 ++
 modules/hadoop/pom.xml                          |    6 -
 modules/indexing/pom.xml                        |    6 -
 .../jdk8-backport/licenses/sun-bcl-license.txt  |   50 -
 modules/jdk8-backport/pom.xml                   |   36 -
 .../org/jdk8/backport/ConcurrentHashMap8.java   | 3825 ------------------
 .../jdk8/backport/ConcurrentLinkedDeque8.java   | 1983 ---------
 .../jdk8/backport/ConcurrentLinkedHashMap.java  | 2170 ----------
 .../main/java/org/jdk8/backport/LongAdder.java  |  235 --
 .../main/java/org/jdk8/backport/Striped64.java  |  370 --
 .../org/jdk8/backport/ThreadLocalRandom8.java   |  231 --
 .../META-INF/licenses/gnu-gplv2ce-license.txt   |  349 --
 modules/visor-console/pom.xml                   |    6 -
 pom.xml                                         |  140 +-
 28 files changed, 9442 insertions(+), 9495 deletions(-)
----------------------------------------------------------------------


Reply via email to