Merge branch 'develop' into java-examples

2015-01-09 10:19:17 -05:00
parent 9af563c265 d9621cb4ba
commit b8971b6ffe
478 changed files with 996 additions and 247 deletions
--- a/lang/java/src/com/wiredtiger/db/PackInputStream.java
+++ b/lang/java/src/com/wiredtiger/db/PackInputStream.java
@@ -1,4 +1,5 @@
 /*-
+ * Public Domain 2014-2015 MongoDB, Inc.
 * Public Domain 2008-2014 WiredTiger, Inc.
 *
 * This is free and unencumbered software released into the public domain.