You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/12/15 19:35:25 UTC
[1/3] accumulo git commit: ACCUMULO-2981 Replace U+2054 with an 'O'
Repository: accumulo
Updated Branches:
refs/heads/1.6 a971489d4 -> 9558b0d05
refs/heads/master 1e9a42cc6 -> 4cedbeb60
ACCUMULO-2981 Replace U+2054 with an 'O'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9558b0d0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9558b0d0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9558b0d0
Branch: refs/heads/1.6
Commit: 9558b0d050cbaf5dceace02b0301a2f493aa6d39
Parents: a971489
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 13:32:18 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 13:32:18 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/master/Master.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9558b0d0/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 496b6a9..66cbac7 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -188,17 +188,17 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt
}
static final boolean X = true;
- static final boolean ⁔ = false; // use U+2054 because a single underscore is deprecated as an identifier in Java 8.
+ static final boolean O = false;
// @formatter:off
static final boolean transitionOK[][] = {
// INITIAL HAVE_LOCK SAFE_MODE NORMAL UNLOAD_META UNLOAD_ROOT STOP
- /* INITIAL */ {X, X, ⁔, ⁔, ⁔, ⁔, X},
- /* HAVE_LOCK */ {⁔, X, X, X, ⁔, ⁔, X},
- /* SAFE_MODE */ {⁔, ⁔, X, X, X, ⁔, X},
- /* NORMAL */ {⁔, ⁔, X, X, X, ⁔, X},
- /* UNLOAD_METADATA_TABLETS */ {⁔, ⁔, X, X, X, X, X},
- /* UNLOAD_ROOT_TABLET */ {⁔, ⁔, ⁔, X, X, X, X},
- /* STOP */ {⁔, ⁔, ⁔, ⁔, ⁔, X, X}};
+ /* INITIAL */ {X, X, O, O, O, O, X},
+ /* HAVE_LOCK */ {O, X, X, X, O, O, X},
+ /* SAFE_MODE */ {O, O, X, X, X, O, X},
+ /* NORMAL */ {O, O, X, X, X, O, X},
+ /* UNLOAD_METADATA_TABLETS */ {O, O, X, X, X, X, X},
+ /* UNLOAD_ROOT_TABLET */ {O, O, O, X, X, X, X},
+ /* STOP */ {O, O, O, O, O, X, X}};
//@formatter:on
synchronized void setMasterState(MasterState newState) {
if (state.equals(newState))
[2/3] accumulo git commit: ACCUMULO-2981 Replace U+2054 with an 'O'
Posted by el...@apache.org.
ACCUMULO-2981 Replace U+2054 with an 'O'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9558b0d0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9558b0d0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9558b0d0
Branch: refs/heads/master
Commit: 9558b0d050cbaf5dceace02b0301a2f493aa6d39
Parents: a971489
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 13:32:18 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 13:32:18 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/master/Master.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9558b0d0/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 496b6a9..66cbac7 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -188,17 +188,17 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt
}
static final boolean X = true;
- static final boolean ⁔ = false; // use U+2054 because a single underscore is deprecated as an identifier in Java 8.
+ static final boolean O = false;
// @formatter:off
static final boolean transitionOK[][] = {
// INITIAL HAVE_LOCK SAFE_MODE NORMAL UNLOAD_META UNLOAD_ROOT STOP
- /* INITIAL */ {X, X, ⁔, ⁔, ⁔, ⁔, X},
- /* HAVE_LOCK */ {⁔, X, X, X, ⁔, ⁔, X},
- /* SAFE_MODE */ {⁔, ⁔, X, X, X, ⁔, X},
- /* NORMAL */ {⁔, ⁔, X, X, X, ⁔, X},
- /* UNLOAD_METADATA_TABLETS */ {⁔, ⁔, X, X, X, X, X},
- /* UNLOAD_ROOT_TABLET */ {⁔, ⁔, ⁔, X, X, X, X},
- /* STOP */ {⁔, ⁔, ⁔, ⁔, ⁔, X, X}};
+ /* INITIAL */ {X, X, O, O, O, O, X},
+ /* HAVE_LOCK */ {O, X, X, X, O, O, X},
+ /* SAFE_MODE */ {O, O, X, X, X, O, X},
+ /* NORMAL */ {O, O, X, X, X, O, X},
+ /* UNLOAD_METADATA_TABLETS */ {O, O, X, X, X, X, X},
+ /* UNLOAD_ROOT_TABLET */ {O, O, O, X, X, X, X},
+ /* STOP */ {O, O, O, O, O, X, X}};
//@formatter:on
synchronized void setMasterState(MasterState newState) {
if (state.equals(newState))
[3/3] accumulo git commit: Merge branch '1.6'
Posted by el...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4cedbeb6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cedbeb6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4cedbeb6
Branch: refs/heads/master
Commit: 4cedbeb6073b18936a506be9bf51bf8475b075b8
Parents: 1e9a42c 9558b0d
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 13:32:55 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 13:32:55 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/master/Master.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cedbeb6/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------