svn commit: r1355106 - in /accumulo/branches/1.3.6: ./ docs/src/user_manual/chapters/table_configuration.tex src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java

[ecn]

Author: ecn
Date: Thu Jun 28 18:48:44 2012
New Revision: 1355106

URL: http://svn.apache.org/viewvc?rev=1355106&view=rev
Log:
bring ACCUMULO-646 and ACCUMULO-661 into 1.3.6

Modified:
    accumulo/branches/1.3.6/   (props changed)
    
accumulo/branches/1.3.6/docs/src/user_manual/chapters/table_configuration.tex
    
accumulo/branches/1.3.6/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java

Propchange: accumulo/branches/1.3.6/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.3:r1354482-1354978

Modified: 
accumulo/branches/1.3.6/docs/src/user_manual/chapters/table_configuration.tex
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.3.6/docs/src/user_manual/chapters/table_configuration.tex?rev=1355106&r1=1355105&r2=1355106&view=diff
==============================================================================
--- 
accumulo/branches/1.3.6/docs/src/user_manual/chapters/table_configuration.tex 
(original)
+++ 
accumulo/branches/1.3.6/docs/src/user_manual/chapters/table_configuration.tex 
Thu Jun 28 18:48:44 2012
@@ -351,7 +351,7 @@ user@myinstance perDayCounts> insert row
 user@myinstance perDayCounts> insert row1 day 20080101 1
 user@myinstance perDayCounts> insert row1 day 20080103 1
 user@myinstance perDayCounts> insert row2 day 20080101 1
-user@myinstance perDayCounts> insert row3 day 20080101 1
+user@myinstance perDayCounts> insert row2 day 20080101 1
 
 user@myinstance perDayCounts> scan
 row1 day:20080101 [] 2

Modified: 
accumulo/branches/1.3.6/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.3.6/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java?rev=1355106&r1=1355105&r2=1355106&view=diff
==============================================================================
--- 
accumulo/branches/1.3.6/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
 (original)
+++ 
accumulo/branches/1.3.6/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
 Thu Jun 28 18:48:44 2012
@@ -94,7 +94,7 @@ public class ColumnVisibility {
     
     byte[] text;
     
-    NodeComparator(byte[] text) {
+    public NodeComparator(byte[] text) {
       this.text = text;
     }