Merge branch 'wip-2763'

diff --cc src/Makefile.am
Simple merge

diff --cc src/rados.cc
index 4c02da5f9d81546c845e17066b170ecf383e8937,3851d769f4a42fadb13d07675de4c39ccdbfc1f9..b75ea29b84dcdf6fc1adfb9a5b682e66d0e0e285
--- 1/src/rados.cc
--- 2/src/rados.cc
+++ b/src/rados.cc
@@@ -103,12 -99,29 +105,29 @@@ void usage(ostream& out
  "       -d / --delete-after          After synchronizing, delete unreferenced\n"
  "                                    files or objects from the target bucket\n"
  "                                    or directory.\n"
 -"       --workers                    Number of worker threads to spawn (default "
 -STR(DEFAULT_NUM_RADOS_WORKER_THREADS) ")\n"
 +"       --workers                    Number of worker threads to spawn \n"
 +"                                    (default " STR(DEFAULT_NUM_RADOS_WORKER_THREADS) ")\n"
  "\n"
+ "ADVISORY LOCKS\n"
+ "   lock list <obj-name>\n"
+ "       List all advisory locks on an object\n"
+ "   lock get <obj-name> <lock-name>\n"
+ "       Try to acquire a lock\n"
+ "   lock break <obj-name> <lock-name> <locker-name>\n"
+ "       Try to break a lock acquired by another client\n"
+ "   lock info <obj-name> <lock-name>\n"
+ "       Show lock information\n"
+ "   options:\n"
+ "       --lock-tag                   Lock tag, all locks operation should use\n"
+ "                                    the same tag\n"
+ "       --lock-cookie                Locker cookie\n"
+ "       --lock-description           Description of lock\n"
+ "       --lock-duration              Lock duration (in seconds)\n"
+ "       --lock-type                  Lock type (shared, exclusive)\n"
+ "\n"
  "GLOBAL OPTIONS:\n"
  "   --object_locator object_locator\n"
 -"        set object_locator for operation"
 +"        set object_locator for operation\n"
  "   -p pool\n"
  "   --pool=pool\n"
  "        select given pool by name\n"