Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f51e6b0c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f51e6b0c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f51e6b0c
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f51e6b0c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f51e6b0c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f51e6b0c
Repository: accumulo
Updated Branches:
refs/heads/1.6 ef8c1ca1e -> 4f02a65d5
refs/heads/1.7 904e957c4 -> f51e6b0c2
ACCUMULO-4076 Leave javadocs in default location
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f
Repository: accumulo
Updated Branches:
refs/heads/master c7b27e0ae -> 67560a618
ACCUMULO-4076 Leave javadocs in default location
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f02a65d
Tree: http://git-wip-us.apache
ACCUMULO-4076 Leave javadocs in default location
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f02a65d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f02a65d
Diff: http://git-wip-us.apache.org/repos/asf/a
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67560a61
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67560a61
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/67560a61
Branch:
Repository: accumulo
Updated Branches:
refs/heads/master 67560a618 -> 794ec90d5
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/python/constants.py
--
diff --git a/proxy/src/main/python/constants.py
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitor
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/AccumuloProxy.h
--
diff --git a/proxy/src/main/cpp/AccumuloProxy.h
b/proxy/src/main/cpp/AccumuloProxy.h
index 269884f..a14fda9 100644
--- a/proxy/src
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
--
diff --git
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
b/proxy
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_types.h
--
diff --git a/proxy/src/main/cpp/proxy_types.h b/proxy/src/main/cpp/proxy_types.h
index 569de88..f7cce4c 100644
--- a/proxy/src/main/c
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/794ec90d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/794ec90d
Diff: http://git-wip-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_types.cpp
--
diff --git a/proxy/src/main/cpp/proxy_types.cpp
b/proxy/src/main/cpp/proxy_types.cpp
index a055b48..8c443e0 100644
--- a/proxy/src
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
b/c
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest
ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3af75fc6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3af75fc6
Diff: http://git-wip-us.ap
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
--
diff --git
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurit
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_constants.cpp
--
diff --git a/proxy/src/main/cpp/proxy_constants.cpp
b/proxy/src/main/cpp/proxy_constants.cpp
index 39a574e..d177867 100644
---
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/python/AccumuloProxy.py
--
diff --git a/proxy/src/main/python/AccumuloProxy.py
b/proxy/src/main/python/AccumuloProxy.py
index 2805fff..83c216c 100644
---
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
--
diff --git
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
b/proxy/src/mai
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletS
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/AccumuloProxy.cpp
--
diff --git a/proxy/src/main/cpp/AccumuloProxy.cpp
b/proxy/src/main/cpp/AccumuloProxy.cpp
index b220dcb..d74ad95 100644
--- a/pro
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionS
24 matches
Mail list logo