http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java
b
http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveSc
Repository: accumulo
Updated Branches:
refs/heads/ACCUMULO-1691 [created] 520f5fdee
http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/trace/src/main/java/org/apache/accumulo/trace/thrift/SpanReceiver.java
--
diff --
ACCUMULO-2773 Regenerate sources for Thrift 0.9.1
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/520f5fde
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/520f5fde
Diff: http://git-wip-us.apache.org/repos/asf/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/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
ACCUMULO-1691 Support Thrift 0.9.1
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/debd8365
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/debd8365
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d
http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
--
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
b/proxy/src/main/j
Author: ctubbsii
Date: Fri May 2 22:58:59 2014
New Revision: 5232
Log:
ACCUMULO-2171 Update dist for 1.6.0 release artifacts
Also fix incorrect whitespace formatting in 1.5.1 hash files
Added:
release/accumulo/1.6.0/
release/accumulo/1.6.0/MD5SUM
release/accumulo/1.6.0/SHA1SUM
Repository: accumulo
Updated Branches:
refs/heads/master 1dae0298f -> 49b1f08c3
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18c0e8e2
Tree: http://git-
Merge branch '1.6.1-SNAPSHOT'
Conflicts:
assemble/pom.xml
core/pom.xml
docs/pom.xml
examples/simple/pom.xml
fate/pom.xml
maven-plugin/pom.xml
minicluster/pom.xml
pom.xml
proxy/pom.xml
server/base/pom.xml
server
[maven-release-plugin] prepare release 1.6.0
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/06162580
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/06162580
Diff: http://git-wip-us.apache.org/repos/asf/accum
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d5ba9da
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d5ba9da
Diff: http://git-wip-u
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-RC5 [deleted] 06162580e
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-RC1 [deleted] 86a9a8a1d
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-RC2 [deleted] e7863ea0d
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-RC4 [deleted] 95ddea99e
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-RC3 [deleted] 901c35857
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT [deleted] 1c38957c4
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d5ba9da
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d5ba9da
Diff: http://git-wip-u
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT [created] 4d5ba9daf
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18c0e8e2
Tree: http:/
Repository: accumulo
Updated Tags: refs/tags/1.6.0 [created] 0cc84e687
21 matches
Mail list logo