You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/07/25 22:38:42 UTC
[1/2] git commit: ACCUMULO-1000 use Assert.fail() vs
Assert.assertTrue(false), delete test folder
Updated Branches:
refs/heads/master 6677a162c -> 260b43188
ACCUMULO-1000 use Assert.fail() vs Assert.assertTrue(false), delete test folder
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ffaba088
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ffaba088
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ffaba088
Branch: refs/heads/master
Commit: ffaba0888389b418dd63901f6336ef2f2236ee79
Parents: 6677a16
Author: Eric Newton <ec...@apache.org>
Authored: Thu Jul 25 10:59:38 2013 -0400
Committer: Eric Newton <ec...@apache.org>
Committed: Thu Jul 25 10:59:38 2013 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/ConditionalWriterTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ffaba088/test/src/test/java/org/apache/accumulo/test/ConditionalWriterTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterTest.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterTest.java
index a42a08b..f5340cc 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterTest.java
@@ -356,7 +356,7 @@ public class ConditionalWriterTest {
try {
cw2.write(cm8).getStatus();
- Assert.assertTrue(false);
+ Assert.fail();
} catch (AccumuloSecurityException ase) {}
@@ -1108,7 +1108,7 @@ public class ConditionalWriterTest {
else if (cf.equals("data") && cq.equals("x"))
Assert.assertEquals("a", val);
else
- Assert.assertTrue(false);
+ Assert.fail();
}
ConditionalMutation cm3 = new ConditionalMutation("r1", new Condition("tx", "seq").setValue("1"));
@@ -1231,6 +1231,6 @@ public class ConditionalWriterTest {
@AfterClass
public static void tearDownAfterClass() throws Exception {
cluster.stop();
- // folder.delete();
+ folder.delete();
}
}
[2/2] git commit: ACCUMULO-1615 applying Ravi Mutyala's patch
Posted by ec...@apache.org.
ACCUMULO-1615 applying Ravi Mutyala's patch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/260b4318
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/260b4318
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/260b4318
Branch: refs/heads/master
Commit: 260b4318802401e82bb0c737e604ab641b57a6cc
Parents: ffaba08
Author: Eric Newton <ec...@apache.org>
Authored: Thu Jul 25 16:38:51 2013 -0400
Committer: Eric Newton <ec...@apache.org>
Committed: Thu Jul 25 16:38:51 2013 -0400
----------------------------------------------------------------------
assemble/scripts/init.d/accumulo-tserver | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/260b4318/assemble/scripts/init.d/accumulo-tserver
----------------------------------------------------------------------
diff --git a/assemble/scripts/init.d/accumulo-tserver b/assemble/scripts/init.d/accumulo-tserver
index 20a5507..a6d60bb 100755
--- a/assemble/scripts/init.d/accumulo-tserver
+++ b/assemble/scripts/init.d/accumulo-tserver
@@ -83,6 +83,8 @@ do_start()
#
do_stop()
{
+ TARGET_USER_NAME="ACCUMULO_USER"
+ TARGET_USER=$(eval "echo \$$TARGET_USER_NAME")
# Return
# 0 if daemon has been stopped
# 1 if daemon was already stopped