summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-10-16 21:04:01 -0700
committerSage Weil <sage@inktank.com>2013-10-16 21:04:01 -0700
commite1e6408403cc628ca09487d152653d09e1218805 (patch)
tree0e56a8cb2ae2e49725fe24fe7c1aedaa9f4971cf
parent5c476277a61902a002401d1655789a87037bc5ac (diff)
parent5c280a242b69eb15a916f2a7b5032a2f7081913b (diff)
downloadceph-e1e6408403cc628ca09487d152653d09e1218805.tar.gz
Merge remote-tracking branch 'gh/next'
-rw-r--r--src/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/.gitignore b/src/.gitignore
index 6efe8dc6bc4..8542ba868f9 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -43,6 +43,7 @@ Makefile
/ceph_smalliobenchrbd
/ceph-monstore-tool
/ceph-osdomap-tool
+/ceph-kvstore-tool
/ceph_ver.h
/dev
/init-ceph