Merge branch 'stable'

Conflicts:
	src/common/config_opts.h

diff --cc src/common/config_opts.h
index 01eed89685c6b4265103e7c51a891f213fba7816,14baea3f9ece5dad07c6da9a161b830f8a4e5040..1d5ba22057d767345cecfc1d586f791ac477f53f
--- 1/src/common/config_opts.h
--- 2/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -22,15 -22,10 +22,15 @@@ OPTION(cluster_network, OPT_STR, ""
  OPTION(num_client, OPT_INT, 1)
  OPTION(monmap, OPT_STR, "")
  OPTION(mon_host, OPT_STR, "")
 -OPTION(daemonize, OPT_BOOL, false)
  OPTION(lockdep, OPT_BOOL, false)
- OPTION(admin_socket, OPT_STR, "/var/run/ceph/$cluster.$name.asok")
+ OPTION(admin_socket, OPT_STR, "/var/run/ceph/$cluster-$name.asok")
 +
 +OPTION(daemonize, OPT_BOOL, false)
 +OPTION(pid_file, OPT_STR, "")
 +OPTION(chdir, OPT_STR, "/")
 +OPTION(max_open_files, OPT_LONGLONG, 0)
 +
- OPTION(log_file, OPT_STR, "/var/log/ceph/$cluster.$name.log")
+ OPTION(log_file, OPT_STR, "/var/log/ceph/$cluster-$name.log")
  OPTION(log_max_new, OPT_INT, 1000)
  OPTION(log_max_recent, OPT_INT, 1000000)
  OPTION(log_to_stderr, OPT_BOOL, true)