]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/log
rocksdb.git
11 years agoMerge pull request #318 from criccomini/master
ankgup87 [Tue, 7 Oct 2014 16:53:20 +0000 (09:53 -0700)]
Merge pull request #318 from criccomini/master

Build RocksDB JNI cross-platform fat jar

11 years agoFix error introduced by merge
Igor Canadi [Tue, 7 Oct 2014 16:47:16 +0000 (09:47 -0700)]
Fix error introduced by merge

11 years agoMerge pull request #340 from nbougalis/nullderef
Igor Canadi [Tue, 7 Oct 2014 16:48:21 +0000 (09:48 -0700)]
Merge pull request #340 from nbougalis/nullderef

Avoid dereferencing a null field

11 years agoMerge pull request #341 from fyrz/arc-lint
Igor Canadi [Tue, 7 Oct 2014 16:44:08 +0000 (09:44 -0700)]
Merge pull request #341 from fyrz/arc-lint

Removed code which prevents `arc lint` from working properly.

11 years agoRemoved code which prevents `arc lint` from working properly.
fyrz [Tue, 7 Oct 2014 15:40:19 +0000 (17:40 +0200)]
Removed code which prevents `arc lint` from working properly.

11 years agoAvoid dereferencing a null field
Nik Bougalis [Sat, 4 Oct 2014 21:38:37 +0000 (14:38 -0700)]
Avoid dereferencing a null field

11 years agoMerge pull request #270 from tdfischer/check-with-unity
Igor Canadi [Tue, 7 Oct 2014 06:07:07 +0000 (23:07 -0700)]
Merge pull request #270 from tdfischer/check-with-unity

Build unity build on make check

11 years agoupdate release readme
Chris Riccomini [Mon, 6 Oct 2014 15:24:51 +0000 (08:24 -0700)]
update release readme

11 years agofix java doc directory in git ignore
Chris Riccomini [Mon, 6 Oct 2014 15:23:31 +0000 (08:23 -0700)]
fix java doc directory in git ignore

11 years agomerge master to resolve merge conflicts
Chris Riccomini [Mon, 6 Oct 2014 15:22:55 +0000 (08:22 -0700)]
merge master to resolve merge conflicts

11 years agomake publish jni jars depend on release jni jars
Chris Riccomini [Mon, 6 Oct 2014 15:20:56 +0000 (08:20 -0700)]
make publish jni jars depend on release jni jars

11 years agoMerge pull request #335 from fyrz/version-script-cross-platform
Igor Canadi [Sat, 4 Oct 2014 18:58:07 +0000 (11:58 -0700)]
Merge pull request #335 from fyrz/version-script-cross-platform

Cross-platform fix version.sh