[3/3] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' (for ACCUMULO-2421).

[bhavanki]

Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' (for ACCUMULO-2421).

Conflicts:
        core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java


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

Branch: refs/heads/master
Commit: 2b3202aee60a92c909d28d6376e73fc4cac1b370
Parents: 07604ca 04d8cd8
Author: Bill Havanki <bhava...@cloudera.com>
Authored: Fri Feb 28 15:07:58 2014 -0500
Committer: Bill Havanki <bhava...@cloudera.com>
Committed: Fri Feb 28 15:07:58 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/client/impl/Tables.java  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b3202ae/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index 10ef48f,5988bda..1dd9ef0
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@@ -287,18 -287,21 +287,22 @@@ public class Tables 
  
    /**
     * Returns the namespace id for a given table ID.
-    * @param instance The Accumulo Instance
-    * @param tableId The tableId
+    * 
+    * @param instance
+    *          The Accumulo Instance
+    * @param tableId
+    *          The tableId
     * @return The namespace id which this table resides in.
-    * @throws IllegalArgumentException if the table doesn't exist in ZooKeeper
+    * @throws IllegalArgumentException
+    *           if the table doesn't exist in ZooKeeper
     */
    public static String getNamespaceId(Instance instance, String tableId) 
throws IllegalArgumentException {
 -    ArgumentChecker.notNull(instance, tableId);
 +    checkArgument(instance != null, "instance is null");
 +    checkArgument(tableId != null, "tableId is null");
-     
+ 
      ZooCache zc = getZooCache(instance);
      byte[] n = zc.get(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + 
tableId + Constants.ZTABLE_NAMESPACE);
-     
+ 
      // We might get null out of ZooCache if this tableID doesn't exist
      if (null == n) {
        throw new IllegalArgumentException("Table with id " + tableId + " does 
not exist");