Merge pull request #91 from basho/csm-rebased-ring-status

Add new ring availability page.
basho · Jun 10, 2013 · b9b635d · b9b635d
2 parents 1b30368 + 64e18c0
commit b9b635d
Show file tree

Hide file tree

Showing 27 changed files with 3,002 additions and 874 deletions.
diff --git a/include/riak_control.hrl b/include/riak_control.hrl
@@ -32,6 +32,8 @@
 -type handoffs()      :: [handoff()].
 -type vnodes()        :: [vnode()].
 -type plan()          :: [] | legacy | ring_not_ready | unavailable.
+-type transfer()      :: riak_core_ring:pending_change().
+-type transfers()     :: [transfer()].
 
 -type stage_error() :: nodedown
                      | already_leaving

diff --git a/priv/admin/css/cluster.styl b/priv/admin/css/cluster.styl
@@ -536,10 +536,6 @@ CSS to be applied ONLY on the cluster page
         width : 38%
         .field-container
           width : 95%
-    
+
     .actions-container
       display : none
-
-
-
-