[49/50] [abbrv] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT'

[kturner]

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT'

Conflicts:
        .gitignore
        
core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
        server/src/main/java/org/apache/accumulo/server/master/Master.java


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

Branch: refs/heads/master
Commit: ae4653287f8e2e20e48e3b43ca3f3bec84d82d9a
Parents: d9ab844 8622b4d
Author: Keith Turner <ktur...@apache.org>
Authored: Wed Jul 31 11:00:22 2013 -0400
Committer: Keith Turner <ktur...@apache.org>
Committed: Wed Jul 31 11:00:22 2013 -0400

----------------------------------------------------------------------
 .../core/client/admin/TableOperationsImpl.java  |  14 +-
 .../apache/accumulo/server/master/Master.java   |   5 +-
 .../accumulo/server/trace/TraceServer.java      |   2 +-
 .../org/apache/accumulo/test/CloneTest.java     | 133 +++++++++++++++++++
 4 files changed, 148 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae465328/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
----------------------------------------------------------------------
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
index 983608a,3aca348..215d326
--- 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
@@@ -116,8 -111,10 +116,10 @@@ import org.apache.thrift.transport.TTra
   */
  public class TableOperationsImpl extends TableOperationsHelper {
    private Instance instance;
 -  private TCredentials credentials;
 +  private Credentials credentials;
    
+   public static final String CLONE_EXCLUDE_PREFIX = "!";
+ 
    private static final Logger log = Logger.getLogger(TableOperations.class);
    
    /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae465328/server/src/main/java/org/apache/accumulo/server/master/Master.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae465328/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
----------------------------------------------------------------------