Merge remote-tracking branch 'gh/wip-javadoc'

diff --cc src/java/.gitignore
index bdadfdbd11f3bfa46a1030d03ab7a7141bfc076b,d4bf845242ffffe298d19b4d849245888cd990b6..6aa4d620937a49c4955ee0305abe2ee0d4d98db8
--- 1/src/java/.gitignore
--- 2/src/java/.gitignore
+++ b/src/java/.gitignore
@@@ -1,5 -1,5 +1,6 @@@
  *.class
  libcephfs.jar
 +libcephfs-test.jar
  native/com_ceph_fs_CephMount.h
  TEST-*.txt
+ doc

diff --cc src/java/java/com/ceph/fs/CephMount.java
Simple merge