You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/12/26 16:51:22 UTC
[1/3] git commit: ACCUMULO-1910 Add source to to test jars that did
not have source.
Updated Branches:
refs/heads/1.5.1-SNAPSHOT 0d58654e7 -> 280b6a6de
ACCUMULO-1910 Add source to to test jars that did not have source.
Some of the jars used in test cases did not have source code. This patch
replaces those jars in 1.4.5-SNAPSHOT with jars that contain both .class
and .java files.
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43ab1ef7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43ab1ef7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43ab1ef7
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 43ab1ef70581c56169aa6ba4a5f715565519a333
Parents: 55827af
Author: Ed Coleman <de...@etcoleman.com>
Authored: Wed Dec 25 09:00:49 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 26 10:09:45 2013 -0500
----------------------------------------------------------------------
.../src/test/resources/ClassLoaderTestA/Test.jar | Bin 748 -> 1570 bytes
.../src/test/resources/ClassLoaderTestB/Test.jar | Bin 748 -> 1572 bytes
.../src/test/resources/ClassLoaderTestC/Test.jar | Bin 748 -> 1571 bytes
test/system/auto/TestCombinerX.jar | Bin 868 -> 4335 bytes
test/system/auto/TestCombinerY.jar | Bin 868 -> 4335 bytes
5 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/43ab1ef7/src/start/src/test/resources/ClassLoaderTestA/Test.jar
----------------------------------------------------------------------
diff --git a/src/start/src/test/resources/ClassLoaderTestA/Test.jar b/src/start/src/test/resources/ClassLoaderTestA/Test.jar
index db0f238..8b9c462 100644
Binary files a/src/start/src/test/resources/ClassLoaderTestA/Test.jar and b/src/start/src/test/resources/ClassLoaderTestA/Test.jar differ
http://git-wip-us.apache.org/repos/asf/accumulo/blob/43ab1ef7/src/start/src/test/resources/ClassLoaderTestB/Test.jar
----------------------------------------------------------------------
diff --git a/src/start/src/test/resources/ClassLoaderTestB/Test.jar b/src/start/src/test/resources/ClassLoaderTestB/Test.jar
index e6652b4..4ced46f 100644
Binary files a/src/start/src/test/resources/ClassLoaderTestB/Test.jar and b/src/start/src/test/resources/ClassLoaderTestB/Test.jar differ
http://git-wip-us.apache.org/repos/asf/accumulo/blob/43ab1ef7/src/start/src/test/resources/ClassLoaderTestC/Test.jar
----------------------------------------------------------------------
diff --git a/src/start/src/test/resources/ClassLoaderTestC/Test.jar b/src/start/src/test/resources/ClassLoaderTestC/Test.jar
index 717ab02..87b077e 100644
Binary files a/src/start/src/test/resources/ClassLoaderTestC/Test.jar and b/src/start/src/test/resources/ClassLoaderTestC/Test.jar differ
http://git-wip-us.apache.org/repos/asf/accumulo/blob/43ab1ef7/test/system/auto/TestCombinerX.jar
----------------------------------------------------------------------
diff --git a/test/system/auto/TestCombinerX.jar b/test/system/auto/TestCombinerX.jar
index df3f50d..849e447 100644
Binary files a/test/system/auto/TestCombinerX.jar and b/test/system/auto/TestCombinerX.jar differ
http://git-wip-us.apache.org/repos/asf/accumulo/blob/43ab1ef7/test/system/auto/TestCombinerY.jar
----------------------------------------------------------------------
diff --git a/test/system/auto/TestCombinerY.jar b/test/system/auto/TestCombinerY.jar
index c17d92c..6cffd86 100644
Binary files a/test/system/auto/TestCombinerY.jar and b/test/system/auto/TestCombinerY.jar differ
[3/3] git commit: ACCUMULO-1910 Add updated HelloWorld2.jar and
FooConstraint.jar, provided by Ed Coleman,
which contain source files as well as the class files.
Posted by el...@apache.org.
ACCUMULO-1910 Add updated HelloWorld2.jar and FooConstraint.jar, provided by Ed Coleman, which contain source files as well as the class files.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/280b6a6d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/280b6a6d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/280b6a6d
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 280b6a6dee719bcef68d7f4f8e187b2a6abcd3d2
Parents: 663b7ec
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 26 10:49:44 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 26 10:49:44 2013 -0500
----------------------------------------------------------------------
start/src/test/resources/HelloWorld2.jar | Bin 575 -> 1483 bytes
test/src/test/resources/FooConstraint.jar | Bin 1079 -> 2130 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/280b6a6d/start/src/test/resources/HelloWorld2.jar
----------------------------------------------------------------------
diff --git a/start/src/test/resources/HelloWorld2.jar b/start/src/test/resources/HelloWorld2.jar
index aa8db21..2dc06ea 100644
Binary files a/start/src/test/resources/HelloWorld2.jar and b/start/src/test/resources/HelloWorld2.jar differ
http://git-wip-us.apache.org/repos/asf/accumulo/blob/280b6a6d/test/src/test/resources/FooConstraint.jar
----------------------------------------------------------------------
diff --git a/test/src/test/resources/FooConstraint.jar b/test/src/test/resources/FooConstraint.jar
index c856a26..14673da 100644
Binary files a/test/src/test/resources/FooConstraint.jar and b/test/src/test/resources/FooConstraint.jar differ
[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
src/start/src/test/resources/ClassLoaderTestA/Test.jar
src/start/src/test/resources/ClassLoaderTestB/Test.jar
src/start/src/test/resources/ClassLoaderTestC/Test.jar
test/system/auto/TestCombinerX.jar
test/system/auto/TestCombinerY.jar
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/663b7ecc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/663b7ecc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/663b7ecc
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 663b7ecc05132ef5aebf2e4a38d0c33e7fb4e374
Parents: 0d58654 43ab1ef
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 26 10:39:13 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 26 10:39:13 2013 -0500
----------------------------------------------------------------------
.../src/test/resources/ClassLoaderTestA/Test.jar | Bin 748 -> 1570 bytes
.../src/test/resources/ClassLoaderTestB/Test.jar | Bin 748 -> 1572 bytes
.../src/test/resources/ClassLoaderTestC/Test.jar | Bin 748 -> 1571 bytes
test/system/auto/TestCombinerX.jar | Bin 1525 -> 4335 bytes
test/system/auto/TestCombinerY.jar | Bin 1524 -> 4335 bytes
5 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/663b7ecc/start/src/test/resources/ClassLoaderTestA/Test.jar
----------------------------------------------------------------------
diff --cc start/src/test/resources/ClassLoaderTestA/Test.jar
index 0c55958,0000000..8b9c462
mode 100644,000000..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/accumulo/blob/663b7ecc/start/src/test/resources/ClassLoaderTestB/Test.jar
----------------------------------------------------------------------
diff --cc start/src/test/resources/ClassLoaderTestB/Test.jar
index 0b714c2,0000000..4ced46f
mode 100644,000000..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/accumulo/blob/663b7ecc/start/src/test/resources/ClassLoaderTestC/Test.jar
----------------------------------------------------------------------
diff --cc start/src/test/resources/ClassLoaderTestC/Test.jar
index 2d21e04,0000000..87b077e
mode 100644,000000..100644
Binary files differ