Merge branch 'unstable' of ssh://ceph.newdream.net/git/ceph into unstable

Conflicts:

	src/ceph-daemons

diff --cc src/ceph-daemons
index 6f3d3130600c1ec9947f7a0866ed5996af1053ff,18867c47d75886ec8667ae1b094c6f504d8f4f7c..1ad0e2022bbc40bac5c2a67f3447fde68572172d
--- 1/src/ceph-daemons
--- 2/src/ceph-daemons
+++ b/src/ceph-daemons
@@@ -77,19 -75,18 +77,20 @@@ what="$@
  
  if [[ $what = "" ]]; then
      # extract list of monitors, mdss, osds defined in startup.conf
 -    what=`$CCONF -c $startup_conf -l mon | egrep -v '^mon$' ; \
 -      $CCONF -c $startup_conf -l mds | egrep -v '^mds$' ; \
 -      $CCONF -c $startup_conf -l osd | egrep -v '^osd$'`
 +    what=`$CCONF -c $conf -l mon | egrep -v '^mon$' ; \
 +      $CCONF -c $conf -l mds | egrep -v '^mds$' ; \
 +      $CCONF -c $conf -l osd | egrep -v '^osd$'`
  fi
  
+ # get hostname, minus any domain
  hostname=`hostname | cut -d . -f 1`
 -for item in $what; do
 +for name in $what; do
-     type=`echo $name | cut -c 1-3` 
+     type=`echo $item | cut -c 1-3`   # e.g. 'mon', if $item is 'mon1'
 +    sections="$name $type global"
 +    num=`echo $name | cut -c 4-`
  
      # this host?
 -    host=`$CCONF -c $startup_conf -s $item -s $type -s global host`
 +    host=`$CCONF -c $conf -s $name -s $type -s global host`
      ssh=""
      cmd=""
      if [[ $host != "" ]]; then