Merge branch 'unstable' into auth

Conflicts:
	src/Makefile.am
	src/mkmonfs.cc
	src/msg/SimpleMessenger.cc

1 files changed, 2 insertions, 2 deletions

diff --git a/src/streamtest.cc b/src/streamtest.cc
index 0923f11f5be..3fd8057c821 100644
--- a/src/streamtest.cc
+++ b/src/streamtest.cc
@@ -107,7 +107,7 @@ int main(int argc, const char **argv)
   }
 
   ObjectStore::Transaction ft;
-  ft.create_collection(0);
+  ft.create_collection(coll_t());
   fs->apply_transaction(ft);
 
   utime_t now = g_clock.now();
@@ -121,7 +121,7 @@ int main(int argc, const char **argv)
     utime_t start = now;
     set_start(pos, now);
     ObjectStore::Transaction t;
-    t.write(0, poid, pos, bytes, bl);
+    t.write(coll_t(), poid, pos, bytes, bl);
     fs->apply_transaction(t, new C_Commit(pos));
     now = g_clock.now();
     set_ack(pos, now);