Merge branch 'unstable' into filestore

Conflicts:

	src/authtool.cc
	src/config.cc

diff --cc src/Makefile.am
Simple merge

diff --cc src/TODO
index 276b6ac4e40b07b0f1d099e6309b59495ecc644d,ea9de663a37ac4520340728b6938a0c7b786bc7a..5e414dabc9a42a78e3b25cf7a32907d78e4ae47c
--- 1/src/TODO
--- 2/src/TODO
+++ b/src/TODO
@@@ -33,51 -33,21 +33,27 @@@ v0.1
  - tids in fixed msg header (protocol change)
  - feature bits during connection handshake
  - remove erank from ceph_entity_addr
+ - disk format, compat/incompat bits
+ - journal format improvements
+ - kclient: cephx
+ - improved truncation
  
- - compat/incompat bits
- 
- - kclient: handle enomem on reply using tid in msg header
- 
- - audit truncation sequence
-   - should mds recovery recover truncation metadata?
+ - mkcephfs: cephx support
  
  - qa: snap test.  maybe walk through 2.6.* kernel trees?
- 
  - osd: rebuild pg log
  - osd: handle storage errors
- 
  - rebuild mds hierarchy
- 
  - kclient: retry alloc on ENOMEM when reading from connection?
  
 +filestore
 +- throttling
 +- flush objects onto primary during recovery
 +- audit queue_transaction calls for dependencies
 +- convert apply_transaction calls in handle_map to queue?
 +  - need an osdmap cache layer?
  
- pending wire format changes
- /- include a __u64 tid in ceph_msg_header
- /- compat bits during connection handshake
- - compat bits during auth/mount with monitor?
- /- remove erank from ceph_entity_addr
- 
- pending mds format changes
- - compat/incompat flags
- 
- pending osd format changes
- - current/ subdir 
- /- compat/incompat flags
- 
- pending mon format changes
- /- add v to PGMap, PGMap::Incremental
-  /- others?
- /- compat/incompat flags
- 
  bugs
- /- 'mount.ceph server:/ relpath' puts relpath (not canonicalized name) in /etc/mtab. df gets confused
- 
  - kclient: on umount -f
  [ 4683.361323] INFO: task umount:15840 blocked for more than 120 seconds.
  [ 4683.367910] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.

diff --cc src/config.cc
index a0c040aa5e6dcc9de4509fb63ca75248c61a12c8,8c8bba478fc6612d39be3d5ebd91d224fb00579b..5b1ca4b34cb373ffc9734c3f401f5d0bb3f381d3
--- 1/src/config.cc
--- 2/src/config.cc
+++ b/src/config.cc
@@@ -353,8 -353,7 +353,8 @@@ static struct config_option config_opti
        OPTION(debug_paxos, 0, OPT_INT, 0),
        OPTION(debug_tp, 0, OPT_INT, 0),
        OPTION(debug_auth, 0, OPT_INT, 1),
-       OPTION(keys_file, 'k', OPT_STR, "~/.ceph/keyring.bin, /etc/ceph/keyring.bin, .ceph_keyring"),
 +      OPTION(debug_finisher, 0, OPT_INT, 1),
+       OPTION(keyring, 'k', OPT_STR, "~/.ceph/keyring.bin, /etc/ceph/keyring.bin, .ceph_keyring"),
        OPTION(supported_auth, 0, OPT_STR, "none"),
        OPTION(clock_lock, 0, OPT_BOOL, false),
        OPTION(clock_tare, 0, OPT_BOOL, false),

diff --cc src/config.h
Simple merge

diff --cc src/os/FileJournal.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/vstart.sh
Simple merge