]> git.sur5r.net Git - openldap/log
openldap
8 years agoMerge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
Quanah Gibson-Mount [Thu, 28 Jan 2016 03:51:52 +0000 (21:51 -0600)]
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

8 years agoITS 8362 - Fix link to BerkeleyDB download location
Quanah Gibson-Mount [Wed, 27 Jan 2016 18:24:30 +0000 (12:24 -0600)]
ITS 8362 - Fix link to BerkeleyDB download location

8 years agoITS#8353 partial fix
Howard Chu [Tue, 26 Jan 2016 18:06:46 +0000 (18:06 +0000)]
ITS#8353 partial fix

Use newly added SSL_CTX_up_ref()
Still waiting for X509_NAME accessor

8 years agoITS#8360 tweak for LDAP_TXNs too
Howard Chu [Tue, 26 Jan 2016 13:39:53 +0000 (13:39 +0000)]
ITS#8360 tweak for LDAP_TXNs too

8 years agoITS#8360 fix ad info after failed txn
Howard Chu [Tue, 26 Jan 2016 13:28:17 +0000 (13:28 +0000)]
ITS#8360 fix ad info after failed txn

If an add or modify op referenced a previously unused attrtype,
the mi_ads/mi_numads would be incremented to include it. If the
op fails to commit, these additions must also be reverted.

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Sun, 24 Jan 2016 11:39:13 +0000 (11:39 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoITS#8355, doc update
Howard Chu [Sun, 24 Jan 2016 11:38:35 +0000 (11:38 +0000)]
ITS#8355, doc update

8 years agoITS#8355 fix subcursors
Howard Chu [Sun, 24 Jan 2016 11:32:49 +0000 (11:32 +0000)]
ITS#8355 fix subcursors

make sure C_DEL gets reset in subcursor after it moves.

8 years agoUpdate WRITEMAP doc
Howard Chu [Sat, 23 Jan 2016 16:51:42 +0000 (16:51 +0000)]
Update WRITEMAP doc

8 years agoITS#8354 move abandon check
Howard Chu [Sat, 23 Jan 2016 16:06:32 +0000 (16:06 +0000)]
ITS#8354 move abandon check

8 years agoITS#8354 tweak prev commit
Howard Chu [Fri, 22 Jan 2016 20:46:23 +0000 (20:46 +0000)]
ITS#8354 tweak prev commit

Delay mutex init to avoid leaking the mutex

8 years agoITS#8354 fix syncprov abandon
Howard Chu [Fri, 22 Jan 2016 20:41:48 +0000 (20:41 +0000)]
ITS#8354 fix syncprov abandon

Check for abandon just before recording psearch

8 years agoITS#8353 partial fixes
Howard Chu [Thu, 21 Jan 2016 18:01:17 +0000 (18:01 +0000)]
ITS#8353 partial fixes

ERR_remove_state() is deprecated since OpenSSL 1.0.0
Use X509_NAME_ENTRY_get_object() instead of direct access.

8 years agoMerge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
Quanah Gibson-Mount [Tue, 19 Jan 2016 00:22:18 +0000 (18:22 -0600)]
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

8 years agoITS#8351 fix accesslog callback init
Howard Chu [Fri, 15 Jan 2016 10:37:56 +0000 (10:37 +0000)]
ITS#8351 fix accesslog callback init

8 years agoITS#8334, mdb_copy
Hallvard Furuseth [Sat, 9 Jan 2016 08:10:55 +0000 (09:10 +0100)]
ITS#8334, mdb_copy

8 years agoFixups for env_copy with large files
Howard Chu [Sat, 2 Jan 2016 12:19:42 +0000 (12:19 +0000)]
Fixups for env_copy with large files

wsize was being truncated to 32bits on Windows.
Only try to write 1GB at a time on Windows64;
larger writes fail with ERROR_WORKING_SET_QUOTA.

8 years agoMinGW warning cleanup: _MSC_VER -> _WIN32.
Howard Chu [Sat, 19 Dec 2015 23:51:31 +0000 (23:51 +0000)]
MinGW warning cleanup: _MSC_VER -> _WIN32.

From 1ba5adb2ec262405f9207d6015d4f29eea548d25 "MDB_VL32 preparation".

8 years agoMatching rules for olc attrs
Quanah Gibson-Mount [Fri, 8 Jan 2016 22:24:41 +0000 (16:24 -0600)]
Matching rules for olc attrs
new syslog engine
regcomp/regexec

8 years agoITS#8334 Fix MDB_APPENDDUP vs. rewrite(single item)
Hallvard Furuseth [Tue, 8 Dec 2015 15:43:55 +0000 (16:43 +0100)]
ITS#8334 Fix MDB_APPENDDUP vs. rewrite(single item)

8 years agoMerge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
Quanah Gibson-Mount [Mon, 4 Jan 2016 19:47:16 +0000 (13:47 -0600)]
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Mon, 4 Jan 2016 19:37:49 +0000 (19:37 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoITS#8336
Howard Chu [Mon, 4 Jan 2016 19:35:40 +0000 (19:35 +0000)]
ITS#8336

8 years agoITS#8336 fix page_search_root assert on FreeDB
Howard Chu [Tue, 8 Dec 2015 18:17:24 +0000 (18:17 +0000)]
ITS#8336 fix page_search_root assert on FreeDB

Let "illegal" branch pages thru on the FreeDB - the condition
is only temporary and will be fixed by the time rebalance finishes.

8 years agoMDB_RESERVE doc
Howard Chu [Tue, 22 Dec 2015 18:30:41 +0000 (18:30 +0000)]
MDB_RESERVE doc

Add mdb_put text to mdb_cursor_put description for people who
fail to draw logical conclusions.

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Sat, 19 Dec 2015 23:09:33 +0000 (23:09 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoITS#7992 cleanup, new docs, mdb_dbi_open cleanup
Howard Chu [Sat, 19 Dec 2015 23:06:00 +0000 (23:06 +0000)]
ITS#7992 cleanup, new docs, mdb_dbi_open cleanup

8 years agoAdd Getting Started doc
Howard Chu [Sat, 19 Dec 2015 22:53:26 +0000 (22:53 +0000)]
Add Getting Started doc

8 years agoITS#7992 cleanup
Howard Chu [Tue, 15 Dec 2015 18:45:34 +0000 (18:45 +0000)]
ITS#7992 cleanup

check for utf8_to_utf16 failures

8 years agomdb_dbi_open(): Catch strdup failure
Hallvard Furuseth [Sat, 12 Dec 2015 18:25:06 +0000 (19:25 +0100)]
mdb_dbi_open(): Catch strdup failure

8 years agoITS#8337 fix missing olcDbChecksum config attr
Howard Chu [Sat, 12 Dec 2015 16:14:02 +0000 (16:14 +0000)]
ITS#8337 fix missing olcDbChecksum config attr

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Thu, 3 Dec 2015 19:27:23 +0000 (19:27 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoITS#8329 finish prev commit
Howard Chu [Thu, 3 Dec 2015 19:25:32 +0000 (19:25 +0000)]
ITS#8329 finish prev commit

8 years agoITS#8329 Add the id_query config item.
Paul Terry [Thu, 3 Dec 2015 17:44:21 +0000 (17:44 +0000)]
ITS#8329 Add the id_query config item.

8 years agoITS#8169, #8330
Howard Chu [Thu, 3 Dec 2015 19:14:11 +0000 (19:14 +0000)]
ITS#8169, #8330

8 years agoITS#8330 Fix robust mutex detection for glibc 2.10 and 2.11
Sebastien Launay [Thu, 3 Dec 2015 18:42:36 +0000 (10:42 -0800)]
ITS#8330 Fix robust mutex detection for glibc 2.10 and 2.11

pthread_mutexattr_setrobust and pthread_mutex_consistent are provided since 2.12 not 2.10:
https://sourceware.org/git/?p=glibc.git;a=commit;h=402cd98775db1478f64c9b0dbe00664b89eb2773
https://sourceware.org/git/?p=glibc.git;a=commit;h=78ee21859939ff75ccf8bbe00499b0c462df2e2d

8 years agoITS#8169 more Makefile tweaks
Howard Chu [Tue, 1 Dec 2015 13:48:29 +0000 (13:48 +0000)]
ITS#8169 more Makefile tweaks

Fix prev commit, use all the same vars as main OpenLDAP makefiles

8 years agoReturn to releng
Howard Chu [Thu, 3 Dec 2015 19:08:00 +0000 (19:08 +0000)]
Return to releng

8 years agoITS#8327 fix ppolicy_get_default
Howard Chu [Thu, 3 Dec 2015 00:58:33 +0000 (00:58 +0000)]
ITS#8327 fix ppolicy_get_default

pwdMaxRecordedFailure must never be zero

8 years agoMerge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
Quanah Gibson-Mount [Mon, 30 Nov 2015 16:59:23 +0000 (10:59 -0600)]
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Mon, 30 Nov 2015 16:56:37 +0000 (16:56 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoRelease 0.9.17 LMDB_0.9.17
Howard Chu [Mon, 30 Nov 2015 16:55:33 +0000 (16:55 +0000)]
Release 0.9.17

8 years agoMerge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
Quanah Gibson-Mount [Mon, 30 Nov 2015 16:51:57 +0000 (10:51 -0600)]
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Mon, 30 Nov 2015 12:51:14 +0000 (12:51 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoITS#8321 cleanup unused var
Howard Chu [Tue, 24 Nov 2015 20:21:51 +0000 (20:21 +0000)]
ITS#8321 cleanup unused var

from da67af1a4bf1a6d3f5d173d9daf74bb4ec66175a

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Tue, 24 Nov 2015 16:10:48 +0000 (16:10 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoITS#8168, 8169
Howard Chu [Tue, 24 Nov 2015 16:08:53 +0000 (16:08 +0000)]
ITS#8168, 8169

8 years agoITS#8169 Allow passing mandir to make install
Heiko Becker [Thu, 11 Jun 2015 19:09:59 +0000 (21:09 +0200)]
ITS#8169 Allow passing mandir to make install

The motivation for this change is my distribution moving to a multiarch
layout. While the architecture specific stuff (binaries, libraries,
etc.) is installed under /usr/${host}/{bin,lib,...} architecture-independent
data should still be installed to /usr/share/.

8 years agoITS#8168 Allow passing AR to make
Heiko Becker [Thu, 11 Jun 2015 18:44:06 +0000 (20:44 +0200)]
ITS#8168 Allow passing AR to make

This is helpful when the ar executable is named differently, for
example with an arch specific prefix.

8 years agoITS#8323
Howard Chu [Tue, 24 Nov 2015 16:01:25 +0000 (16:01 +0000)]
ITS#8323

8 years agoITS#8321 fix ambiguity in cursor_put fixup
Howard Chu [Tue, 24 Nov 2015 15:09:49 +0000 (15:09 +0000)]
ITS#8321 fix ambiguity in cursor_put fixup

After delete/add of a node, other nodes may no longer be
pointing at the data they intended. This can confuse subsequent
fixups.

8 years agoCleanup C_DEL flag usage
Howard Chu [Tue, 24 Nov 2015 12:14:49 +0000 (12:14 +0000)]
Cleanup C_DEL flag usage

Only set it if the cursor's current position was deleted

8 years agoITS#8321 More cursor fixup
Howard Chu [Mon, 23 Nov 2015 16:58:57 +0000 (16:58 +0000)]
ITS#8321 More cursor fixup

Based on page_touch fixup from ITS#7594 but expanded:
make sure sub-cursors agree with main cursors.

8 years agoITS#8321 page_touch - don't fixup the cursor we just touched
Howard Chu [Mon, 23 Nov 2015 13:19:26 +0000 (13:19 +0000)]
ITS#8321 page_touch - don't fixup the cursor we just touched

8 years agoITS#8321 mdb_put cursor needs tracking too
Howard Chu [Tue, 24 Nov 2015 01:21:05 +0000 (01:21 +0000)]
ITS#8321 mdb_put cursor needs tracking too

8 years agoITS#8321 Fix mdb_cursor_set
Howard Chu [Mon, 23 Nov 2015 18:30:24 +0000 (18:30 +0000)]
ITS#8321 Fix mdb_cursor_set

Always reinit mc_pg[0] if cursor is not C_INITIALIZED
It might have a stale value when using nested txns

8 years agoITS#8321 deinit empty cursors
Howard Chu [Tue, 24 Nov 2015 12:54:46 +0000 (12:54 +0000)]
ITS#8321 deinit empty cursors

Always unset C_INIT flag if the cursor's target DB has been deleted

8 years agoITS#8323 Fix nested commit
Howard Chu [Mon, 23 Nov 2015 13:11:29 +0000 (13:11 +0000)]
ITS#8323 Fix nested commit

Must remove our spilled pages from parent's dirty list

8 years agoCURSOR_TMP_[UN]TRACK() -> WITH_CURSOR_TRACKING()
Hallvard Furuseth [Mon, 23 Nov 2015 12:03:09 +0000 (13:03 +0100)]
CURSOR_TMP_[UN]TRACK() -> WITH_CURSOR_TRACKING()

8 years agoITS#8319, 8320
Howard Chu [Mon, 23 Nov 2015 02:02:36 +0000 (02:02 +0000)]
ITS#8319, 8320

8 years agoITS#8320 mdb_load: fix loading data from simple text files
Orivej Desh [Sun, 22 Nov 2015 01:15:14 +0000 (01:15 +0000)]
ITS#8320 mdb_load: fix loading data from simple text files

mdb_load -T was supposed to read escaped text, but 21b51cb7 "Add mdb_load"
made it read hex.

8 years agoITS#8319 mdb_load: explain readline and mdb_cursor_put errors
Orivej Desh [Sun, 22 Nov 2015 00:59:55 +0000 (00:59 +0000)]
ITS#8319 mdb_load: explain readline and mdb_cursor_put errors

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Mon, 23 Nov 2015 01:52:30 +0000 (01:52 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoITS#8316, 8321
Howard Chu [Mon, 23 Nov 2015 01:51:45 +0000 (01:51 +0000)]
ITS#8316, 8321

8 years agoITS#8321 reorganize page_split fixups
Howard Chu [Mon, 23 Nov 2015 01:34:26 +0000 (01:34 +0000)]
ITS#8321 reorganize page_split fixups

DUPFIXED fixups needed to occur after separator update.
MDB_RESERVE handling moved after split fixup.

8 years agoITS#8321 simplify page_split fixups
Howard Chu [Mon, 23 Nov 2015 01:33:00 +0000 (01:33 +0000)]
ITS#8321 simplify page_split fixups

8 years agoITS#8321 track temporary cursors
Howard Chu [Mon, 23 Nov 2015 01:30:02 +0000 (01:30 +0000)]
ITS#8321 track temporary cursors

In rebalance/split operations, temporary cursors need to be visible
to propagate fixups

8 years agoITS#8321 fix mdb_cursor_put
Howard Chu [Mon, 23 Nov 2015 01:16:36 +0000 (01:16 +0000)]
ITS#8321 fix mdb_cursor_put

Ignore sub-cursors that shouldn't be fixed up

8 years agoITS#8321 fix mdb_cursor_shadow()
Howard Chu [Mon, 23 Nov 2015 01:13:16 +0000 (01:13 +0000)]
ITS#8321 fix mdb_cursor_shadow()

Set a valid txn so that cursor fixup code works on the shadows

8 years agoITS#8321 fix mdb_cursor_chk()
Howard Chu [Mon, 23 Nov 2015 01:10:05 +0000 (01:10 +0000)]
ITS#8321 fix mdb_cursor_chk()

It was reporting spurious errors due to uninit'd cursors

8 years agoITS#8321 don't skip fixups on splitting cursors
Howard Chu [Mon, 23 Nov 2015 01:07:57 +0000 (01:07 +0000)]
ITS#8321 don't skip fixups on splitting cursors

Adjustments can't be skipped, in recursive calls each level must
fixup their own level.

8 years agoITS#8321 Fix del/dupsort
Howard Chu [Sun, 22 Nov 2015 22:11:30 +0000 (22:11 +0000)]
ITS#8321 Fix del/dupsort

When deleting a dupsort key, if other cursors pointed at that key,
set them to uninit'd, not EOF. They no longer have anything to
point at.

8 years agoITS#8300 more for prev commit
Howard Chu [Fri, 20 Nov 2015 13:34:11 +0000 (13:34 +0000)]
ITS#8300 more for prev commit

Just tell explicitly which direction we moved/merged from

8 years agoSilence some valgrind uninit warnings
Howard Chu [Fri, 20 Nov 2015 09:47:56 +0000 (09:47 +0000)]
Silence some valgrind uninit warnings

8 years agoRefix root split check from 5da67968afb599697d7557c13b65fb961ec408dd
Howard Chu [Fri, 20 Nov 2015 09:20:16 +0000 (09:20 +0000)]
Refix root split check from 5da67968afb599697d7557c13b65fb961ec408dd

8 years agoITS#7992 assume Windows paths are UTF-8
Oskari Timperi [Fri, 5 Dec 2014 10:56:22 +0000 (12:56 +0200)]
ITS#7992 assume Windows paths are UTF-8

8 years agoITS#8316 cursor fixup in page_merge
Howard Chu [Thu, 19 Nov 2015 20:04:16 +0000 (20:04 +0000)]
ITS#8316 cursor fixup in page_merge

Deleting the merged page requires bumping down other ki's
of the page's parent.

8 years agoITS#8312, 8313, 8315
Howard Chu [Thu, 19 Nov 2015 17:29:42 +0000 (17:29 +0000)]
ITS#8312, 8313, 8315

8 years agoITS#8315 fix ovpage_free
Howard Chu [Wed, 18 Nov 2015 23:38:34 +0000 (23:38 +0000)]
ITS#8315 fix ovpage_free

Keep dirty_room sync'd with dirty_list

8 years agoITS#8313 more for ITS#8062
Howard Chu [Wed, 18 Nov 2015 21:33:51 +0000 (21:33 +0000)]
ITS#8313 more for ITS#8062

dummy flags must be init'd due to 3d46d550

8 years agoITS#8312 Fix loose pages in commit(nested txn)
Hallvard Furuseth [Wed, 18 Nov 2015 15:30:24 +0000 (16:30 +0100)]
ITS#8312 Fix loose pages in commit(nested txn)

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Wed, 18 Nov 2015 10:28:46 +0000 (10:28 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoITS#8311
Howard Chu [Wed, 18 Nov 2015 10:27:50 +0000 (10:27 +0000)]
ITS#8311

8 years agoITS#8311 add comment
Howard Chu [Wed, 18 Nov 2015 10:24:41 +0000 (10:24 +0000)]
ITS#8311 add comment

8 years agoITS#8311 fix page_split from update_key
Howard Chu [Wed, 18 Nov 2015 00:33:25 +0000 (00:33 +0000)]
ITS#8311 fix page_split from update_key

Check for top of stack. Usually the cursor only has height 1 when
calling page_split, but not always.

8 years agoMerge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
Quanah Gibson-Mount [Tue, 17 Nov 2015 18:19:26 +0000 (12:19 -0600)]
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

8 years agoITS#7209
Hallvard Furuseth [Tue, 17 Nov 2015 17:49:31 +0000 (18:49 +0100)]
ITS#7209

8 years agoITS#7209 Default MDB_DSYNC = O_SYNC if no O_DSYNC
Hallvard Furuseth [Tue, 17 Nov 2015 17:22:25 +0000 (18:22 +0100)]
ITS#7209 Default MDB_DSYNC = O_SYNC if no O_DSYNC

8 years agoITS#8295 more for prev commit
Howard Chu [Mon, 16 Nov 2015 13:36:20 +0000 (13:36 +0000)]
ITS#8295 more for prev commit

Silence warnings about struct timeval declaration

8 years agoMerge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
Quanah Gibson-Mount [Fri, 13 Nov 2015 16:08:24 +0000 (10:08 -0600)]
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Fri, 13 Nov 2015 09:29:40 +0000 (09:29 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoITS#8310
Howard Chu [Fri, 13 Nov 2015 09:28:36 +0000 (09:28 +0000)]
ITS#8310

8 years agoITS#8310 fix mdb_rebalance cursor fixup
Howard Chu [Fri, 13 Nov 2015 09:25:55 +0000 (09:25 +0000)]
ITS#8310 fix mdb_rebalance cursor fixup

When collapsing root, must adjust entire cursor stack

8 years agoMerge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
Quanah Gibson-Mount [Wed, 11 Nov 2015 16:24:18 +0000 (10:24 -0600)]
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Wed, 11 Nov 2015 11:51:34 +0000 (11:51 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'

8 years agoTweak robust mutex detection for glibc
Howard Chu [Wed, 11 Nov 2015 00:02:06 +0000 (00:02 +0000)]
Tweak robust mutex detection for glibc

8 years agoMerge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
Quanah Gibson-Mount [Tue, 10 Nov 2015 21:58:53 +0000 (15:58 -0600)]
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

8 years agoITS#8297 sleep before checking contextCSN values
Quanah Gibson-Mount [Tue, 10 Nov 2015 21:58:20 +0000 (15:58 -0600)]
ITS#8297 sleep before checking contextCSN values

8 years agoMerge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
Quanah Gibson-Mount [Mon, 9 Nov 2015 21:20:49 +0000 (15:20 -0600)]
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

8 years agoMerge remote-tracking branch 'origin/mdb.RE/0.9'
Howard Chu [Mon, 9 Nov 2015 20:15:59 +0000 (20:15 +0000)]
Merge remote-tracking branch 'origin/mdb.RE/0.9'