Merge branch 'master' into wip-freebsd

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/client/Client.cc
Simple merge

diff --cc src/common/DoutStreambuf.cc
Simple merge

diff --cc src/common/Thread.cc
index 96b22460895fc07648ca5a6b71053d8eebe39791,343218162f138cb087ffaa578efbdf2fda5fa106..c0809f07ec958a79d3afdf07d5bedd08e63b86d0
--- 1/src/common/Thread.cc
--- 2/src/common/Thread.cc
+++ b/src/common/Thread.cc
@@@ -26,10 -26,10 +26,9 @@@
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
 -#include <sys/user.h> // for PAGE_MASK
  
  
- Thread::
- Thread()
+ Thread::Thread()
    : thread_id(0)
  {
  }
@@@ -105,11 -98,10 +97,10 @@@ int Thread::kill(int signal
      return -EINVAL;
  }
  
- int Thread::
- try_create(size_t stacksize)
+ int Thread::try_create(size_t stacksize)
  {
    pthread_attr_t *thread_attr = NULL;
 -  stacksize &= PAGE_MASK;  // must be multiple of page
 +  stacksize &= CEPH_PAGE_MASK;  // must be multiple of page
    if (stacksize) {
      thread_attr = (pthread_attr_t*) malloc(sizeof(pthread_attr_t));
      pthread_attr_init(thread_attr);

diff --cc src/crushtool.cc
Simple merge

diff --cc src/include/ceph_fs.h
Simple merge

diff --cc src/include/rados.h
Simple merge

diff --cc src/include/rados/librados.h
Simple merge

diff --cc src/include/types.h
Simple merge

diff --cc src/mds/MDS.cc
Simple merge

diff --cc src/mds/Server.cc
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/msg/msg_types.h
Simple merge

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

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

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

diff --cc src/os/ObjectStore.h
Simple merge

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

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

diff --cc src/rbd.cc
Simple merge

diff --cc src/tools/common.cc
Simple merge