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 2014/01/02 22:13:46 UTC

[1/2] git commit: ACCUMULO-2124 [~kturner] found another typo

Updated Branches:
  refs/heads/master a0567c562 -> 495d7aec8


ACCUMULO-2124 [~kturner] found another typo


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

Branch: refs/heads/master
Commit: a56b76602767c062cd80e93f0437758dab02a266
Parents: 9bfef59
Author: Eric Newton <er...@gmail.com>
Authored: Thu Jan 2 16:13:47 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Jan 2 16:13:47 2014 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/examples/simple/reservations/ARS.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a56b7660/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
index 5e71acf..2df1834 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
@@ -46,7 +46,7 @@ import org.apache.hadoop.io.Text;
  */
 
 // EXCERCISE create a test that verifies correctness under concurrency. For example, have M threads making reservations against N resources. Each thread could
-// randomly reserve and cancel resources for a single user. When each thread finishes, it know what the state of its single user should be. When all threads
+// randomly reserve and cancel resources for a single user. When each thread finishes, it knows what the state of its single user should be. When all threads
 // finish, collect their expected state and verify the status of all users and resources. For extra credit run the test on a IAAS provider using 10 nodes and
 // 10 threads per node.
 


[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 495d7aec862678111f9f9e8065da51fbeaa7bf25
Parents: a0567c5 a56b766
Author: Eric Newton <er...@gmail.com>
Authored: Thu Jan 2 16:14:00 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Jan 2 16:14:00 2014 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/examples/simple/reservations/ARS.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------