You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/10/10 17:21:07 UTC
[1/2] git commit: ACCUMULO-1585 sometimes addresses are advertized as
host+port
Updated Branches:
refs/heads/master 95cb49043 -> 7f8c42d0f
ACCUMULO-1585 sometimes addresses are advertized as host+port
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40e167ce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40e167ce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40e167ce
Branch: refs/heads/master
Commit: 40e167ce42c194e707a6b0941248704835ddb071
Parents: 05b3359
Author: Eric Newton <er...@gmail.com>
Authored: Thu Oct 10 11:10:39 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Oct 10 11:10:39 2013 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40e167ce/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java b/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
index 49d689e..08d4368 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
@@ -22,6 +22,7 @@ public class AddressUtil {
static public HostAndPort parseAddress(String address) throws NumberFormatException {
+ address = address.replace('+', '-');
HostAndPort hap = HostAndPort.fromString(address);
if (!hap.hasPort())
throw new IllegalArgumentException("Address was expected to contain port. address=" + address);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/accumulo
Posted by ec...@apache.org.
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/7f8c42d0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7f8c42d0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7f8c42d0
Branch: refs/heads/master
Commit: 7f8c42d0fef609384de482cfd62c6c5f5402af64
Parents: 40e167c 95cb490
Author: Eric Newton <er...@gmail.com>
Authored: Thu Oct 10 11:17:30 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Oct 10 11:17:30 2013 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/conf/Property.java | 13 ++-
pom.xml | 7 +-
.../apache/accumulo/server/ServerConstants.java | 19 ++--
.../accumulo/server/fs/VolumeManagerImpl.java | 12 ++-
.../server/tabletserver/InMemoryMap.java | 2 -
.../server/tabletserver/MutationLog.java | 99 --------------------
6 files changed, 30 insertions(+), 122 deletions(-)
----------------------------------------------------------------------